From patchwork Wed Oct 11 21:37:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 151564 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp829515vqb; Wed, 11 Oct 2023 14:37:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFiJqGMrVwX1am2GE6ruLM+J78rlvQ1ht00ZVEVkTrY7XfRyYj7ek5zmctCLs1/nGGp+frY X-Received: by 2002:a17:90b:4b04:b0:27d:1593:2b08 with SMTP id lx4-20020a17090b4b0400b0027d15932b08mr1443211pjb.0.1697060265626; Wed, 11 Oct 2023 14:37:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697060265; cv=none; d=google.com; s=arc-20160816; b=Sy8iWt79jfQczeFXtuy4c9kpgUny2ZWGa2bFvsQS3MoDEWQDuGv6olNIvbDwV0r08u 2WAwcCflWrWkwwiSA2ioX6QUq8XaxLpFhaW8Uz1vIU9G9awSFIPBajZYu0cj52qELrK6 6buK2p1cTBD1NJpCtqaPI/7F/1JIR7wWkYeu3pe0uHT1ypPwLVqJMsSfi6WcLUbIE0go vMMdXVyYxQJcCuANX/xmLmPDhtH7250+4pK/3dbMMj7D2krkP12bbnk8ektO/YF4VlCQ smqgXxubTIpsCqJHRhwhoky1QFnaCqvlS5F4jBE0TSg5qcj6L9CTqrdzwrByUgQL9WFg gsDg== 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=bdhtumD96yS+0S1renjDPDHQ2oQXBATflGNogyMiPxo=; fh=cXPjbYgacklQF4oURiGZhEFYUT0FRh+kicY/HpZ3keM=; b=ITiXUBjui7VgSRJjQa1bUNTn6wEAV+ZN+8cnw/mlpO7XnSARW6PLxNVGB/Fnl7CnWb Pks1R5xeSDWUcDLQWowCdBMgavD+4gt/LvJFNWglOFJPUU2FgaOBHrCgz94pcDuI1EnX 0gSbCycV9AGn6+nxoBzY2waJMi2GQsg1dgrTXrSZvZX37+PWrLBj49ExbhOtbyPbhnPN LFw8cG5AYK1P6JiDnNiCdZZ/LF8i4BUDDnKeBphTij6fIx0EfiPEa5tw6Vxjvw0T2dMl QEFk9GSeUzTzi0QK91yIShskW53aLoBk4wxWAh2pMV+vEJ1SF+Aq4ibI9B8L2mYV2piu 8HkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=FYsi7NxU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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. [23.128.96.34]) by mx.google.com with ESMTPS id ls9-20020a17090b350900b00276945c92c1si831438pjb.36.2023.10.11.14.37.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 14:37:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=FYsi7NxU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 659E9821FD22; Wed, 11 Oct 2023 14:37:43 -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 S233527AbjJKVh0 (ORCPT + 18 others); Wed, 11 Oct 2023 17:37:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233390AbjJKVhZ (ORCPT ); Wed, 11 Oct 2023 17:37:25 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 545259E for ; Wed, 11 Oct 2023 14:37:24 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5a7dac80595so4845837b3.0 for ; Wed, 11 Oct 2023 14:37:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1697060243; x=1697665043; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=bdhtumD96yS+0S1renjDPDHQ2oQXBATflGNogyMiPxo=; b=FYsi7NxUvtyZOx4yy3AL/VbGncYW0njm/7eSGeZ4KjtXpMJLuFlI6ND23E9M9LYg3x 8ahgUTqXhlXr2urankGdcWXnEcvrWnJqPqA/UjuQYZz+E0Wdnbqd6KlRiXNdAPShgmp0 FNir1yxTYR4bydgt0VnaxHgRQeWyQMQwe7Tqz22zR0B6Xuq8FmWGABkIoLdsc5BX0JZd PPt0JCKdb3u+pf7E9rDMgZzW1y9eakXd5Qj5r6NiJYubsZu6RZm0W3lyqTErXlRxazMh QsloiX95YMt8jjVCrMybyWSyYgkhkFXVIi9oryxdSCK4GOl0eh2DXy058QmW3RWeTCNe OOyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697060243; x=1697665043; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=bdhtumD96yS+0S1renjDPDHQ2oQXBATflGNogyMiPxo=; b=mRowyIs7t7DqJ3XGpxon6VwSQJFfRqwwhTHVNhBPaJhG1jD4rTs+5tLu0GMWlLA/BV 7oxJgqPGoK28HERhmThnK4TrbMRvak7cY+kt60mtuHFqUJuGwFHMxEesjkmOLU1XCZzP Q3isJDKhUzUF7uE9E//ESNpBOqfC3gQ3RWWu2m1wx8bRgn+LMsPkpvtD6Qy1x3FqGVGK n3vqOyw5ePayrZKKiF4Le/JE9vEhUKoHZ+IP7L3ncQo42Mz1uAYI2pdd12TOXgWO4UHs MN3GkpSEMVMr0/NUIUwiKcpyaDYiGkCOG/WeGxCCr1zhbgjVBCTxvEM/5M+rqpEOPFqF 3QjQ== X-Gm-Message-State: AOJu0YxeMOLdqxlkOQDIwcCQLmu/wbD8MQZCFhbMZ4+AoyvpJD8LNzmI SMrgDuVHHAjv7HZpO6M+4H+j6lhjP9S2yQ6wMQ== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:4056:0:b0:d9a:4f4c:961b with SMTP id n83-20020a254056000000b00d9a4f4c961bmr131018yba.1.1697060243280; Wed, 11 Oct 2023 14:37:23 -0700 (PDT) Date: Wed, 11 Oct 2023 21:37:18 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAI0VJ2UC/y2OUQrCQAxEr1LybaDbarVeRURqmroB3V2SpVRK7 +4qfs08eDCzgrEKG5yrFZRnMYmhgNtVQH4ID0YZC0NTN62rnUPLGii9cVSZWQ0DZ+TsWb/lJaS RvCS0NOhy+MetCDnGJxIe+/bUd+O9o2kPZSQpT7L8Dlyu2/YBrl/wDZAAAAA= X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1697060242; l=1738; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=s+mTiltMqX7As4CbGqq/2I96f5ZlgOW3Hq371eE6U+A=; b=ortN8RXCgeBg2EiOfufpEEBmLQpe8xksMJsaC4JoTO2illgEiCNaRXqc2GNe2S/2gmaFOFSuc i++d+IVn74jAvc5kUy5AXBSjvAe9ZIm7qtF4OH5athk1nrp+QrRszKS X-Mailer: b4 0.12.3 Message-ID: <20231011-strncpy-drivers-net-ethernet-microchip-sparx5-sparx5_ethtool-c-v1-1-410953d07f42@google.com> Subject: [PATCH] net: sparx5: replace deprecated strncpy with ethtool_sprintf From: Justin Stitt To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Lars Povlsen , Steen Hegelund , Daniel Machon , UNGLinuxDriver@microchip.com Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.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]); Wed, 11 Oct 2023 14:37:43 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779496665192684939 X-GMAIL-MSGID: 1779496665192684939 strncpy() is deprecated for use on NUL-terminated destination strings [1] and as such we should prefer more robust and less ambiguous string interfaces. ethtool_sprintf() is designed specifically for get_strings() usage. Let's replace strncpy() in favor of this more robust and easier to understand interface. 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 Reviewed-by: Kees Cook --- Note: build-tested only. Found with: $ rg "strncpy\(" --- drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- base-commit: cbf3a2cb156a2c911d8f38d8247814b4c07f49a2 change-id: 20231011-strncpy-drivers-net-ethernet-microchip-sparx5-sparx5_ethtool-c-793896db6cf4 Best regards, -- Justin Stitt diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c b/drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c index 01f3a3a41cdb..37d2584b48a7 100644 --- a/drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c @@ -1012,8 +1012,7 @@ static void sparx5_get_sset_strings(struct net_device *ndev, u32 sset, u8 *data) return; for (idx = 0; idx < sparx5->num_ethtool_stats; idx++) - strncpy(data + idx * ETH_GSTRING_LEN, - sparx5->stats_layout[idx], ETH_GSTRING_LEN); + ethtool_sprintf(&data, "%s", sparx5->stats_layout[idx]); } static void sparx5_get_sset_data(struct net_device *ndev,