Message ID | 20231005-strncpy-drivers-net-ethernet-cavium-liquidio-lio_ethtool-c-v1-1-ab565ab4d197@google.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp578443vqb; Thu, 5 Oct 2023 14:33:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGuUStNVEY93z7bi2wQTOtdzUkQbuJhZEw9QWFlp5MgTTHAZd6s7M/ffMGawGBbK5X6X9fR X-Received: by 2002:a05:6e02:1d89:b0:34f:2756:8fd with SMTP id h9-20020a056e021d8900b0034f275608fdmr7295166ila.9.1696541608463; Thu, 05 Oct 2023 14:33:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696541608; cv=none; d=google.com; s=arc-20160816; b=OREtlG2D+szB3IVnlvedv668YX3MkNv1J1YWPKDSfaPV7eBShLulBbYBeG0KX3zNQ6 icPDEMKZuXQh60Eu4kONPME5+qNFEzFHQ0DuuSrljej0MiVhihvtNG0YhMnWKKK7CSAJ sCB720hba8pobUxpdheyjaHwn6hxHb1UdpXygewy+S8lwqWLaIin3sFTcRHv/WS+Xn+G 9VqwEQuDtO8gUpz466feCuNhuFj+6pSxK/g1cx5+mGWzVvaZVkyHZS1W5oOmcJeZMiC0 1B0P2YMYNkPZZ7iu9M8lP9HjBSDpwUFjke74eaWQ1slqjKP8rrsZdTjA8ZOsm6gnFaxW Aw+A== 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=DBeGsTEWaeHMVhG88NcKDZwFuePbfbjL4RyYq3i7W/U=; fh=k0DJpSVuFxhYTyKz71bivhLvl6X/Bx5Sm302pubg0Zg=; b=AB1F9Q/Q84zidQUZ65EHoZ/hJcEpvWdgKg3Mvgo3OljrXx9VOg92ztICwsm/Wcyp9F K0LWHT7iZ5FqLWChqeTxwoN8CiRAcRfmwYL3rGQKQ2I18L6YevWd9My/5TFKqkc68iqP XtLpSaK1vwqkJM/QMQtoY38vfvbpxxY3qYGLTtFbxnM01gWVyMiXWWn3AU8SJtZDg7SX eqx0PHs20OhsM0XvkaEzmTCE5fHI4K8A4D3WSIqZJcGCPuN+bBr91VAUXjeDWTNTfxnt z6HYMrVAGJ7oUxA80tdr4xDhG+3KR8D0ib9qouG/fmkwIHaZZWjm8vv2lbG+qbihmqUk b7qQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b="w7WfL1/G"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id m125-20020a633f83000000b005859c255cedsi2180264pga.197.2023.10.05.14.33.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 14:33:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b="w7WfL1/G"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 C0498831EDAD; Thu, 5 Oct 2023 14:33:27 -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 S229889AbjJEVdZ (ORCPT <rfc822;ezelljr.billy@gmail.com> + 18 others); Thu, 5 Oct 2023 17:33:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229750AbjJEVdX (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 5 Oct 2023 17:33:23 -0400 Received: from mail-oo1-xc49.google.com (mail-oo1-xc49.google.com [IPv6:2607:f8b0:4864:20::c49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4D06E9 for <linux-kernel@vger.kernel.org>; Thu, 5 Oct 2023 14:33:20 -0700 (PDT) Received: by mail-oo1-xc49.google.com with SMTP id 006d021491bc7-57b739e5637so1762320eaf.2 for <linux-kernel@vger.kernel.org>; Thu, 05 Oct 2023 14:33:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1696541600; x=1697146400; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=DBeGsTEWaeHMVhG88NcKDZwFuePbfbjL4RyYq3i7W/U=; b=w7WfL1/G6/y1GScimOJYHT+87Q8GMHJNBFsijTmekIyEQMcgZEcTh815QBNPe8vhUD J83dm8TvK7umU+fVBL7mDSyWfYlZX3OVkCvu4a58MXdRkFIqi1lT4IBq3rbbS3LZHg+4 /9Ya1TbRfR5EFgoDapnJDipaTzGaAXv474aJj71A9jt4qC9kOvD2v4LbVGjkKY2PuPIF bSQKwZK/0FrFQs+5Tyids8wKoaVVe8lGJY52MpD8/qcp5TGX4sydFZxaUMBEfH1Mab3G QQEkNkrZFWymaSuqfShJc2qjAUF4S+ZeJn7bFvEQfQAawSTa6ENKyH+j6pMd1LEcsPvL EVeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696541600; x=1697146400; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=DBeGsTEWaeHMVhG88NcKDZwFuePbfbjL4RyYq3i7W/U=; b=oTPUVOB17hUMh2+znSlVw6zETzsn6OcW4nOxtA5Fbq4iIXtOBa+i8vCqNTDq617zvt UP0uS0mfS1bpHhpYWHnECulSi8hYDZIXKuBvdsWcgZSCBCxDUf9gO99TBfjdwphNo96b bcFZIvimrrUW8wX+ys8cvOB+tfTBFdxHMPOvOfF92nEyyfKT4Rnt3y9bdxThoQApv4u0 TM8OigTlBeMI97Vg5LfPoa6dR3Gmm/ipc8cOWSdFvUr87FFKdbXAy42B5HRwe94kOl8z qbydmUiLk/B5VPEocykD+p8iJILLXM+x66JZiynD3faOCLiZQ5Qomc+DLth8McS6jm0c u4WA== X-Gm-Message-State: AOJu0YybqPH9gR+XHVE+7UOgkPEUvX8I6pxrebnyXjKjcVW3RucFGm0Q j+ED1QODB7uyZz+V7VQ/mZJMOH60EDeha9gTjA== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a4a:4f42:0:b0:57b:3840:4c85 with SMTP id c63-20020a4a4f42000000b0057b38404c85mr2335028oob.1.1696541600124; Thu, 05 Oct 2023 14:33:20 -0700 (PDT) Date: Thu, 05 Oct 2023 21:33:19 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAJ4rH2UC/x2NQQrCMBAAv1L27EKSoqhfEZGabOxCTepuGpTSv xu9zTCHWUFJmBTO3QpClZVzamJ3HfhxSA9CDs3BGddbY/aoRZKfPxiEK4liooJURpIf+KHy8sS JXwsHzg3yrcWS84Qe74dT77yJRxMttMEsFPn9n1+u2/YFMCiAn4wAAAA= X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1696541598; l=2730; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=PKPsb45o8cJUMR1NbV9bY/ZXdX56wnhP8PdDKS7CtXE=; b=V1BHnD4OOJXpH/xgsaKnRxTqiT9ViCdlfEibIwEOSbm+ZYxyvmHL5E4Z4Ng26ZmlHpUNgDba/ +ghPh0uvDd3Cp21R6QwP2QMeWaE/vV57KKgtRZYIt+iUrL/D/xjBytE X-Mailer: b4 0.12.3 Message-ID: <20231005-strncpy-drivers-net-ethernet-cavium-liquidio-lio_ethtool-c-v1-1-ab565ab4d197@google.com> Subject: [PATCH] liquidio: replace deprecated strncpy/strcpy with strscpy From: Justin Stitt <justinstitt@google.com> To: Derek Chickles <dchickles@marvell.com>, Satanand Burla <sburla@marvell.com>, Felix Manlunas <fmanlunas@marvell.com>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com> Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Justin Stitt <justinstitt@google.com> Content-Type: text/plain; charset="utf-8" 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=unavailable 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: <linux-kernel.vger.kernel.org> 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]); Thu, 05 Oct 2023 14:33:27 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778952813398512678 X-GMAIL-MSGID: 1778952813398512678 |
Series |
liquidio: replace deprecated strncpy/strcpy with strscpy
|
|
Commit Message
Justin Stitt
Oct. 5, 2023, 9:33 p.m. UTC
`strncpy` is deprecated for use on NUL-terminated destination strings
[1] and as such we should prefer more robust and less ambiguous string
interfaces.
NUL-padding is not required as drvinfo is memset to 0:
| memset(drvinfo, 0, sizeof(struct ethtool_drvinfo));
A suitable replacement is `strscpy` [2] due to the fact that it
guarantees NUL-termination on the destination buffer without
unnecessarily NUL-padding.
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 <justinstitt@google.com>
---
Note: build-tested only.
---
drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
---
base-commit: cbf3a2cb156a2c911d8f38d8247814b4c07f49a2
change-id: 20231005-strncpy-drivers-net-ethernet-cavium-liquidio-lio_ethtool-c-b6932c0f80f1
Best regards,
--
Justin Stitt <justinstitt@google.com>
Comments
On Thu, Oct 05, 2023 at 09:33:19PM +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. > > NUL-padding is not required as drvinfo is memset to 0: > | memset(drvinfo, 0, sizeof(struct ethtool_drvinfo)); > > A suitable replacement is `strscpy` [2] due to the fact that it > guarantees NUL-termination on the destination buffer without > unnecessarily NUL-padding. > > 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 <justinstitt@google.com> > --- > Note: build-tested only. > --- > drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 18 ++++++++++-------- > 1 file changed, 10 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c > index 9d56181a301f..d3e07b6ed5e1 100644 > --- a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c > +++ b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c > @@ -442,10 +442,11 @@ lio_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo) > oct = lio->oct_dev; > > memset(drvinfo, 0, sizeof(struct ethtool_drvinfo)); struct ethtool_drvinfo { char driver[32]; ... char fw_version[ETHTOOL_FWVERS_LEN]; char bus_info[ETHTOOL_BUSINFO_LEN]; > - strcpy(drvinfo->driver, "liquidio"); > + strscpy(drvinfo->driver, "liquidio", sizeof(drvinfo->driver)); Yup, this is basically what FORTIFY_SOURCE will do automatically to strcpy(). > - strncpy(drvinfo->fw_version, oct->fw_info.liquidio_firmware_version, > - ETHTOOL_FWVERS_LEN); > + strscpy(drvinfo->fw_version, oct->fw_info.liquidio_firmware_version, > + sizeof(drvinfo->fw_version)); Yup, ETHTOOL_FWVERS_LEN == sizeof(drvinfo->fw_version) > - strncpy(drvinfo->bus_info, pci_name(oct->pci_dev), 32); > + strscpy(drvinfo->bus_info, pci_name(oct->pci_dev), > + sizeof(drvinfo->bus_info)); Yup, ETHTOOL_BUSINFO_LEN == sizeof(drvinfo->bus_info) > } > > static void > @@ -458,10 +459,11 @@ lio_get_vf_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo) > oct = lio->oct_dev; > > memset(drvinfo, 0, sizeof(struct ethtool_drvinfo)); > - strcpy(drvinfo->driver, "liquidio_vf"); > - strncpy(drvinfo->fw_version, oct->fw_info.liquidio_firmware_version, > - ETHTOOL_FWVERS_LEN); > - strncpy(drvinfo->bus_info, pci_name(oct->pci_dev), 32); > + strscpy(drvinfo->driver, "liquidio_vf", sizeof(drvinfo->driver)); > + strscpy(drvinfo->fw_version, oct->fw_info.liquidio_firmware_version, > + sizeof(drvinfo->fw_version)); > + strscpy(drvinfo->bus_info, pci_name(oct->pci_dev), > + sizeof(drvinfo->bus_info)); > } Yup, looks good. Reviewed-by: Kees Cook <keescook@chromium.org> > > static int > > --- > base-commit: cbf3a2cb156a2c911d8f38d8247814b4c07f49a2 > change-id: 20231005-strncpy-drivers-net-ethernet-cavium-liquidio-lio_ethtool-c-b6932c0f80f1 > > Best regards, > -- > Justin Stitt <justinstitt@google.com> > >
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Thu, 05 Oct 2023 21:33:19 +0000 you 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. > > NUL-padding is not required as drvinfo is memset to 0: > | memset(drvinfo, 0, sizeof(struct ethtool_drvinfo)); > > [...] Here is the summary with links: - liquidio: replace deprecated strncpy/strcpy with strscpy https://git.kernel.org/netdev/net-next/c/52cdbea1a54a You are awesome, thank you!
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c index 9d56181a301f..d3e07b6ed5e1 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c @@ -442,10 +442,11 @@ lio_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo) oct = lio->oct_dev; memset(drvinfo, 0, sizeof(struct ethtool_drvinfo)); - strcpy(drvinfo->driver, "liquidio"); - strncpy(drvinfo->fw_version, oct->fw_info.liquidio_firmware_version, - ETHTOOL_FWVERS_LEN); - strncpy(drvinfo->bus_info, pci_name(oct->pci_dev), 32); + strscpy(drvinfo->driver, "liquidio", sizeof(drvinfo->driver)); + strscpy(drvinfo->fw_version, oct->fw_info.liquidio_firmware_version, + sizeof(drvinfo->fw_version)); + strscpy(drvinfo->bus_info, pci_name(oct->pci_dev), + sizeof(drvinfo->bus_info)); } static void @@ -458,10 +459,11 @@ lio_get_vf_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo) oct = lio->oct_dev; memset(drvinfo, 0, sizeof(struct ethtool_drvinfo)); - strcpy(drvinfo->driver, "liquidio_vf"); - strncpy(drvinfo->fw_version, oct->fw_info.liquidio_firmware_version, - ETHTOOL_FWVERS_LEN); - strncpy(drvinfo->bus_info, pci_name(oct->pci_dev), 32); + strscpy(drvinfo->driver, "liquidio_vf", sizeof(drvinfo->driver)); + strscpy(drvinfo->fw_version, oct->fw_info.liquidio_firmware_version, + sizeof(drvinfo->fw_version)); + strscpy(drvinfo->bus_info, pci_name(oct->pci_dev), + sizeof(drvinfo->bus_info)); } static int