From patchwork Tue Oct 10 21:15:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 150969 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp140918vqb; Tue, 10 Oct 2023 14:16:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFvDTpgRar1VIsHNwRBHLG5PSEnAaVAA7uzVe2XtZGcn6+vZb7zipOIh68A6WgsKNu+5jTX X-Received: by 2002:a05:6a20:8f01:b0:15a:2c0b:6c81 with SMTP id b1-20020a056a208f0100b0015a2c0b6c81mr23388887pzk.3.1696972566794; Tue, 10 Oct 2023 14:16:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696972566; cv=none; d=google.com; s=arc-20160816; b=YNaI38dG0k+rh2ts3lDQczsCh7AJU/69ttg0xe3cOeXvVLkrP8YCwBalAFiXfbedA9 2Cv/yycWoOVl3QB5g53bQy9kO0u9SQIewm0aC1v0/D89/if/8b1k2F+CAjPKRBnipPU6 h7ADsMG6HMw78Pve0RQ7aN2/7XSnCytlshWNIfYZATCfSADlA3HCfWZ9Q34TwtyCJqab 3uR4OgN2o67q8RR9wwW8J7BW6m62qhdz9AF2DxeXSF7yUfPFiIi+AVkbQerdCwlpCOYd zxwiu1EQJEljio5IDw8vAWcjAlVtMroAv8iVYO4VvzLtbZHweP2tKC/31loFL+91KPZu w6rA== 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=inAfHUFES32Bj4C70GcKsE711OPK+t9RMjXtNQ5VszM=; fh=KoEe/vQ6ORhGDo5TgnggqYNqVJjSCkGH3Hik0lgvoJY=; b=oov2Dhb3DPeEHVI8mJkTMsyuy5iXkBypE8Rfterdk+fsBoZGgNc1IBdnwktRlXSrjm 8qadBA8E05POO67HJvGlXzPyRs45FEmgSnNChGyHRpdhhCQXBHen/TR3UV3PI/sveUtE qeWsSkWDIeAJO14hw++WSdjgFxmOjWus09NjiXvmEyemVCT9AWQ1KQnCRgAA1df2zOFs SWI4qz7okamNduxO3CKVEHNdX8y8VhCjr+f1EZU+c5Uu7ob5HBH4lS0YtQehcI6vz+SU ibw59EY4dSNtWGd/6lKZqYop4lPHn+HMpJkLHisbgJrwkCqbX4MLu/+dUK3KlIWv62JW fXCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=OFwT5hzx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id f18-20020a056a001ad200b00687008df88dsi10664163pfv.52.2023.10.10.14.16.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 14:16:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=OFwT5hzx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (Postfix) with ESMTP id 09F2680930F5; Tue, 10 Oct 2023 14:15:53 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343879AbjJJVPn (ORCPT + 19 others); Tue, 10 Oct 2023 17:15:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234090AbjJJVPm (ORCPT ); Tue, 10 Oct 2023 17:15:42 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3917594 for ; Tue, 10 Oct 2023 14:15:41 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-d9a61f7aaf8so1417172276.3 for ; Tue, 10 Oct 2023 14:15:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1696972540; x=1697577340; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=inAfHUFES32Bj4C70GcKsE711OPK+t9RMjXtNQ5VszM=; b=OFwT5hzx701CknF/AANYsdyGw6qzpWUZE+ZSQAT0kcVyFNQ0GkGtzp8zYWa+f9d0tM S++c9qb12muBlIC8UWne3c8pegtAvr9BLz7oaY7z54Mjny8duoAZmgTi6KYScJSD85gJ n2/iG4w9osWjs4oLszpbl6kAoDCUr2hlwclwtURYrHfK4Maz8RQDtLzDd1EM9KcGQocD JvB2fvQp+QRKCXSIFP8KrInMZ6AdfnNBBcKAO52cyAoaP7bZ8oxBgxSbhhA90sD608Ha zK3LvttMWQ/uNFLnj57Y90agTZMyU71YJrYFPjx1jYJiChHUNOM9inckgMEfp6FMgARk Y1og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696972540; x=1697577340; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=inAfHUFES32Bj4C70GcKsE711OPK+t9RMjXtNQ5VszM=; b=kfgs98/pmMPuDlaBWNQ3/gw3/Vv2SD918UUk54yQPzYPzMQqfVcYkbOVZobETByGw+ G1tzmcX6Lqn3YknVxCc1HR8Hq9hpxY/P8Wl70aEWkG8OQO98+xyuw8/BmXJZN4azmkHb sNG+tXLmob6r4cgQWce2FrXjBzHVoWNdUXhktoSQTDytNoapaH/lVC7sn+4kZoJ7YQYh d8NTCU7WVcp4fLw03stMn2GZcJ/zNqzyZb2SbFX78e+gzqO89prve5pOG9kdiUMcKiWX JYniHE2GLshtfh4zUxa4ldMa7Ra6xsMAitGNS3i6hEoWODv6mtRBjxmFKWChqJyJT21j A5qw== X-Gm-Message-State: AOJu0YyBf1u8zPFJ5LJMRAs2m1x3yzn/rDy+/i40bAAK56bWHKM1KuDI 4qTokLcWQk3PY1CT2Aw8WC6xp+eIdrvmOS3iVg== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:ac24:0:b0:d9a:3596:a5e8 with SMTP id w36-20020a25ac24000000b00d9a3596a5e8mr87331ybi.7.1696972540475; Tue, 10 Oct 2023 14:15:40 -0700 (PDT) Date: Tue, 10 Oct 2023 21:15:39 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAPq+JWUC/x2N0QrCMBAEf6XcswdJREF/RURism0P9CyXUCql/ 27qw8DOy85KBSYodO1WMsxS5KNN/KGjNEYdwJKbU3Dh6J13XKppmr6cTWZYYUVl1BG2D9GKF8u Qdh7vKMqJwxl9DO6S8/NE7Xcy9LL8m7f7tv0AuewH3oMAAAA= X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1696972539; l=2229; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=aszC9coJ3ufDFemnzGBEFSljINDMKfOjEfDt2TlDPEA=; b=M0LjBlQz4apy3gyX2tH8Osydptr9lDj/JzxqU4f3aGIPfDCpy48DUAn7/iUFhpQnXafN44Mnu 3bQ5fcJIVvbBVvaS1GZ/qGz8AcdS1uPFdCrtmQC0/k/kBHxCMuKuJiG X-Mailer: b4 0.12.3 Message-ID: <20231010-strncpy-drivers-net-ethernet-intel-igc-igc_main-c-v1-1-f1f507ecc476@google.com> Subject: [PATCH] igc: 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=-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 howler.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 (howler.vger.email [0.0.0.0]); Tue, 10 Oct 2023 14:15:53 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779404706338677615 X-GMAIL-MSGID: 1779404706338677615 `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(-) --- base-commit: cbf3a2cb156a2c911d8f38d8247814b4c07f49a2 change-id: 20231010-strncpy-drivers-net-ethernet-intel-igc-igc_main-c-26efa209ddb5 Best regards, -- Justin Stitt 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;