From patchwork Tue Oct 10 18:35:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 150906 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp64252vqb; Tue, 10 Oct 2023 11:36:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFLA9HmWgYNDhxA2UQGnFISa3Z2FoBzlJT/LicMVcxG5i4iS1502fm/AXfWMBrM+WdCvLsm X-Received: by 2002:a17:902:da8d:b0:1c1:fbec:bc3f with SMTP id j13-20020a170902da8d00b001c1fbecbc3fmr21227843plx.5.1696962974895; Tue, 10 Oct 2023 11:36:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696962974; cv=none; d=google.com; s=arc-20160816; b=GGMH+oQnOTjkVD7N74cS8q15+pf+ia1dY15fH3FJ198g+x2Q8d6iYXRB0aaL7ustu4 nXgH6PAvfpAsUyqWkQd5SSKY3kAI2+5yeiddFXoxrsHyQBFVvV0XDETuriB/121l1ps6 BcRSJx8+7CHbz0OxzrNyG+U3N2PunW0u8bja4Ghx7JTxq2NHzmhpJLXJ//Hf460dxEi9 Q9H0aEPsUvEpTp82pwtWniCvQKMkFpQLiM0SXiGs11Licgv/UJJTtxZPf4h7O/+54+xC MSSDLZUDg7vI0xOjLrOls2S212IP7nZFQGjsZir1k99f3nsL0xrbUFnA5kctWChAn64/ h3sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :dkim-signature; bh=k901dfXyM6A6d2qq6am+50364PkFHEr+c7kfdKStNUQ=; fh=KoEe/vQ6ORhGDo5TgnggqYNqVJjSCkGH3Hik0lgvoJY=; b=XG3GzjpCKiVStuWrYmeDb8He4x3rWuc+4eQ++5OMq/cV2VgJ3aZ2AW6BDcLbthoyHN 3e983Y7MLbaCEPTyNVLKxWQItZMowSOLfrb9yOt2P4dQT/TjyzB9sKGWBbzrgrY4c4/0 THnUUevK7FJCEtMmzksVmOml96z8XZwdvOicPqfieQItAl1n0BBZtZyOSFMz8TSsDSY1 s+P2Fcc2RzF0i+lN2Q8OAbTPaL8/iwmb2z1o14a719QGPJ/tU7QWEIRxrQJz/hsHicDS 6regmtKWG24qXP19O8ZUnjyu5X38nMDHUvPO648uQ0mfoVa1ihV1YHyELCE54i8AcwSi Jjxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=HuUhC8dU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id q12-20020a170902dacc00b001c62d7e4831si13435195plx.588.2023.10.10.11.36.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 11:36:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=HuUhC8dU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id D0388802AF2D; Tue, 10 Oct 2023 11:36:13 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234127AbjJJSgG (ORCPT + 19 others); Tue, 10 Oct 2023 14:36:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231213AbjJJSgE (ORCPT ); Tue, 10 Oct 2023 14:36:04 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BFF4B0 for ; Tue, 10 Oct 2023 11:36:01 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-d9a5a3f2d4fso1402088276.3 for ; Tue, 10 Oct 2023 11:36:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1696962960; x=1697567760; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=k901dfXyM6A6d2qq6am+50364PkFHEr+c7kfdKStNUQ=; b=HuUhC8dUWxVj48t43dFnss6buqlB07iXCQgYMt6XmUJ97ARpurqBiewO8vgWu4ruyV c8915V0MsKxWKX0acDQwTpOXgBrSKqv9H0EdiY7CaqDJ9WrwecWP7PA22AKWloUv/0iS U/CIakuHY+C2jMFF90C+iqSD7yM3i5+Rd9CTsEXubdtx/at1ZD1MGjRQHe2DsXFox0wx u5deq/YkPGnvEaNI9tZCXTG+RwnFbRnQ+Wd9NYYpxlzzWrGb6UVJRMzfRKQGjkKRs7jL Kl3fBHXWvN5/SfasYpnQjX34jF+mkqxd2Nl4M8oadvzXrAnhl+OJatsU4KEzNXT9QHCt 0DfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696962960; x=1697567760; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=k901dfXyM6A6d2qq6am+50364PkFHEr+c7kfdKStNUQ=; b=a+p2YGhTSLwR0tXTmOsq2hTiE/x4Icogs97fsQgM3hB0UT9ibSKylty4EtYsks9+rK W+jPRWlZSJ9+He20pULtq4dK/s+dQ0wMH/HmBpAwaB2zj39jhVc+MBK6mxFHsqZKD+y/ tQoS+w7YPIzxVWzWW/EK5InaMkimbdMI6YjtHG/xvcYpLJo0HGMAxEhQkKKvGMml5v+e fdWVtsMCNaBgv8BNdINiTrOiR2jLejb1wNPH4dp0MCjOfdbiP7c+gknp9cib0NUhuNO4 VIQp5D6Fj2Es3Zo13z84I0oRE2VyjZISBBB+qTTpT732BU2a7Eg7gL+ul4zsegY5DA9R TddA== X-Gm-Message-State: AOJu0YwRd4SFdCchXMFaWe7ZRCHQJGlbCGntlyv+NSZwpMjiXyN8Nbn4 +YH6eSZ9p0o0QMqpqLYWT3Eusuc5DskYXDCC+g== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:fc18:0:b0:d85:ae1e:f696 with SMTP id v24-20020a25fc18000000b00d85ae1ef696mr336777ybd.0.1696962960761; Tue, 10 Oct 2023 11:36:00 -0700 (PDT) Date: Tue, 10 Oct 2023 18:35:59 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAI6ZJWUC/yWNywrCMBBFf6XM2oFJVXz8ioiEzNUOaCyTUJTSf zfq5nDP5p6ZCtxQ6NjN5Jis2DM3CauO0hDzDWzanHrp10GCcKme0/hmdZvghTMqow7w77BccWc EEfnz8oiWOXHcbFV1f4Dojtr36Lja69c9nZflA5vSlniHAAAA X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1696962959; l=2137; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=XyZq4bqOiJO85kzWF8DwIoZ3ewao6X+shiHLyqLJcIY=; b=pCu5HtRudfioqViLz3TXwRZEp/DFrJMOIQ2kVRk6uzxbBv73fPuiJSNSllaodomHC/EO4TpVc wLOlN0mORyDC692XBwLhgkNojIGyVvU3rLYgwEKmdsQ9KnFfg3RKcJD X-Mailer: b4 0.12.3 Message-ID: <20231010-strncpy-drivers-net-ethernet-intel-e1000-e1000_main-c-v1-1-b1d64581f983@google.com> Subject: [PATCH] e1000: replace deprecated strncpy with strscpy From: Justin Stitt To: Jesse Brandeburg , Tony Nguyen , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Justin Stitt X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 10 Oct 2023 11:36:13 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779394648401249667 X-GMAIL-MSGID: 1779394648401249667 `strncpy` is deprecated for use on NUL-terminated destination strings [1] and as such we should prefer more robust and less ambiguous string interfaces. We can see that netdev->name is expected to be NUL-terminated based on it's usage with format strings: | pr_info("%s NIC Link is Down\n", | netdev->name); A suitable replacement is `strscpy` [2] due to the fact that it guarantees NUL-termination on the destination buffer without unnecessarily NUL-padding. This is in line with other uses of strscpy on netdev->name: $ rg "strscpy\(netdev\->name.*pci.*" drivers/net/ethernet/intel/e1000e/netdev.c 7455: strscpy(netdev->name, pci_name(pdev), sizeof(netdev->name)); drivers/net/ethernet/intel/ixgbe/ixgbe_main.c 10839: strscpy(netdev->name, pci_name(pdev), sizeof(netdev->name)); Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1] Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html [2] Link: https://github.com/KSPP/linux/issues/90 Cc: linux-hardening@vger.kernel.org Signed-off-by: Justin Stitt --- Note: build-tested only. --- drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: cbf3a2cb156a2c911d8f38d8247814b4c07f49a2 change-id: 20231010-strncpy-drivers-net-ethernet-intel-e1000-e1000_main-c-a45ddd89e0d7 Best regards, -- Justin Stitt diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c index da6e303ad99b..1d1e93686af2 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c @@ -1014,7 +1014,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) netdev->watchdog_timeo = 5 * HZ; netif_napi_add(netdev, &adapter->napi, e1000_clean); - strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1); + strscpy(netdev->name, pci_name(pdev), sizeof(netdev->name)); adapter->bd_number = cards_found;