Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp450626rdg; Tue, 10 Oct 2023 15:43:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHx3NUwgSSzIEuFl8xBpupzbwfqGNjaILMwBRedgeggXNIAeKbLEgTrHJWpXY1bvZWG87oA X-Received: by 2002:a05:6a00:a26:b0:68f:c215:a825 with SMTP id p38-20020a056a000a2600b0068fc215a825mr19059104pfh.12.1696977786636; Tue, 10 Oct 2023 15:43:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696977786; cv=none; d=google.com; s=arc-20160816; b=fveKtPqH51nQx8T1UphYbQfRfWjp3KIwK1h9rlzedkKtNDIFKRDaDOM/LCYtkAX/Gr Ff+w2HGhXJIZkLpZow9mvDwaGbzkAT55FQuAKJSCg4zciaukhOkNd+vHW8K9Kb+gulf6 NI/NRkPAh29QwxAbvuoLKZziIwuAZCcLG8pVv0vAdVxSce/q1l/ZRRBlzBqmQvcsqhGw g9uBJyNGDkkFjBAgU0j/Zt+paUXbs0fuq/WIcv3JJcyZ9iMwAPLtR5ZtRqfGfzOjl2kX ebc4jiSP8zQnoNOHwAhAEcVLyAAZ1QjRQa5n5JiJlZCBlRYeac/oAsZAk4vzJyIP4tSz XaBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=l5epg5slVi2ZMZ2XCdkm8B/4iSOhQb3T0qsBgHlWnKI=; fh=9y4adKj9IXY1LzIPcT6xX3vgN/R4hMpwmgEa5U8HlkU=; b=SHrgBiZlljCy0NAp8WzBSmrnkqzPzDRy8qzBiH1xIebHOZrH7X7Y5OQNdjkwHPTd/j mNCY8Au4o6sAA55McD4YU7bLb76hZdW1Yq/uN8VX68oN/zTIzWCIcQcrUrBeb0tM1MCh C/BlXQXF+qNmkxaLqd19rKdo48M0c43oGki1EPr6MWVq2le+RekjG0scUdIuvmG+iS+n qe4rSqsPyR1T5ekLw6HzczvkP3PNg7uCyM7u30PKTe0sm6MmzqoPyjR21OCIiTVzM482 viiyYbnEEnZV6Ay2Sxe7J9AB/eSGNuzN3kbD89YnlnMjhtFc4LLWdVmF69cOFtpzAczX IUdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=G5I1941g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id bv7-20020a056a00414700b00690c75e54e1si7646410pfb.402.2023.10.10.15.43.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 15:43:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=G5I1941g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id 10DBB80E5BA9; Tue, 10 Oct 2023 15:43:03 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229887AbjJJWmw (ORCPT + 99 others); Tue, 10 Oct 2023 18:42:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229530AbjJJWmv (ORCPT ); Tue, 10 Oct 2023 18:42:51 -0400 Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F76399 for ; Tue, 10 Oct 2023 15:42:49 -0700 (PDT) Received: by mail-io1-xd2c.google.com with SMTP id ca18e2360f4ac-79fca042ec0so248062239f.3 for ; Tue, 10 Oct 2023 15:42:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1696977769; x=1697582569; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=l5epg5slVi2ZMZ2XCdkm8B/4iSOhQb3T0qsBgHlWnKI=; b=G5I1941gI6rQBPq7eXyI3NrqWeXDwQ7ztwIrGkYXd0AISTMJnQ5Lf/XpUXcgL8yQ90 68Zd8oaptqJ2l2MK61Igc7ZZu4Hy0EOMszfT//Wo8HPX8nJh7q3tQ9xyGxEi7lvSP8jS KCWVbsoMg2s4zZFUhlVfxiVo4Lx0p9Lm0YXjfqqPAHq9ke+gwaO0FSZPSa0ocOKZ/52z baz3RIrYElun1W7JzYEJ3tATUE1Ejwb68dxevy3RjdtbbB9Wupo5TXdcvBQGoJHeWG67 +ogZPATQEs93U4yDCR15PKJsPIJQiWmYTimV5zUPxBOob20v5VdnXVGZQTiwdBbpBRRe CE9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696977769; x=1697582569; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=l5epg5slVi2ZMZ2XCdkm8B/4iSOhQb3T0qsBgHlWnKI=; b=QUgAhZSQyRMQYnSMbfJUJFzPYVNJVCeVJ2FviEp8CEBviEDg68bd/7GPo0TUXYRyCN hKq2GQeoUfmOeqFJSVsChy2dvIwmlY8CU5GRoNoXUXVgNANSEDsmJTdHdN4ythrio+j5 OhQte+QO86LUpoOMWSMnAzrOBUgde8sMG/5sPdghzoCpg1JDfp8fAjT36LClP5j7nYnH 2wxnTPm/imLXtHSp8dDdrGnBdhRnM/7BHx2il/nd9vP1Bd+r/doxn1pVGJpacyVtp/13 eCWvy2cz8tqECdSZ1Ks39wtDDy9Lp/pCAnemw/7AaCP9Ao2DQKnQBcnFCPY+WqkVZNW5 QxYA== X-Gm-Message-State: AOJu0Yyk7fQsx/NsPxb7peuHPS+I1p6YOSQOaM6hMARAuPA/O9eAAafa Rt0E0Na35o4Wf9lG6gjkU3X+Qg== X-Received: by 2002:a5e:dd0d:0:b0:786:7100:72de with SMTP id t13-20020a5edd0d000000b00786710072demr20110506iop.16.1696977768722; Tue, 10 Oct 2023 15:42:48 -0700 (PDT) Received: from google.com (161.74.123.34.bc.googleusercontent.com. [34.123.74.161]) by smtp.gmail.com with ESMTPSA id ee24-20020a056638293800b004332f6537e2sm3057256jab.83.2023.10.10.15.42.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 15:42:48 -0700 (PDT) Date: Tue, 10 Oct 2023 22:42:45 +0000 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 Subject: Re: [PATCH] igc: replace deprecated strncpy with strscpy Message-ID: <20231010224245.i57oix72csm7kjp7@google.com> References: <20231010-strncpy-drivers-net-ethernet-intel-igc-igc_main-c-v1-1-f1f507ecc476@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231010-strncpy-drivers-net-ethernet-intel-igc-igc_main-c-v1-1-f1f507ecc476@google.com> X-Spam-Status: No, score=-4.8 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email 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 (agentk.vger.email [0.0.0.0]); Tue, 10 Oct 2023 15:43:03 -0700 (PDT) On Tue, Oct 10, 2023 at 09:15:39PM +0000, Justin Stitt wrote: > `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 expect netdev->name to be NUL-terminated based on its use with format > strings: > | if (q_vector->rx.ring && q_vector->tx.ring) > | sprintf(q_vector->name, "%s-TxRx-%u", netdev->name, > > Furthermore, we do not need NUL-padding as netdev is already > zero-allocated: > | netdev = alloc_etherdev_mq(sizeof(struct igc_adapter), > | IGC_MAX_TX_QUEUES); > ... > alloc_etherdev() -> alloc_etherdev_mq() -> alloc_etherdev_mqs() -> > alloc_netdev_mqs() ... > | p = kvzalloc(alloc_size, GFP_KERNEL_ACCOUNT | __GFP_RETRY_MAYFAIL); > > Considering the above, a suitable replacement is `strscpy` [2] due to > the fact that it guarantees NUL-termination on the destination buffer > without unnecessarily NUL-padding. > > Let's also opt for the more idiomatic strscpy usage of (dest, src, > sizeof(dest)) instead of (dest, src, SOME_LEN). > > 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/igc/igc_main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c > index 98de34d0ce07..e9bb403bbacf 100644 > --- a/drivers/net/ethernet/intel/igc/igc_main.c > +++ b/drivers/net/ethernet/intel/igc/igc_main.c > @@ -6935,7 +6935,7 @@ static int igc_probe(struct pci_dev *pdev, > */ > igc_get_hw_control(adapter); > > - strncpy(netdev->name, "eth%d", IFNAMSIZ); > + strscpy(netdev->name, "eth%d", sizeof(netdev->name)); > err = register_netdev(netdev); > if (err) > goto err_register; > > --- > base-commit: cbf3a2cb156a2c911d8f38d8247814b4c07f49a2 > change-id: 20231010-strncpy-drivers-net-ethernet-intel-igc-igc_main-c-26efa209ddb5 > > Best regards, > -- > Justin Stitt > Hi, this patch was bundled up with some others. It has a new home: https://lore.kernel.org/all/20231010-netdev-replace-strncpy-resend-as-series-v1-0-caf9f0f2f021@google.com/