From patchwork Mon Oct 9 18:29:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 150252 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp2050600vqo; Mon, 9 Oct 2023 11:29:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGSqOLMFLmemLQ3bS6DEsA5SAos/7WqFNZlf6Kqsf9fkvQ2SS0ky7KsUt/yVLi0n/bhm8Ze X-Received: by 2002:a17:902:f54c:b0:1c1:e818:1e76 with SMTP id h12-20020a170902f54c00b001c1e8181e76mr19882323plf.6.1696876173410; Mon, 09 Oct 2023 11:29:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696876173; cv=none; d=google.com; s=arc-20160816; b=F+9ji4H+igti4rK8PGhwuFN4JlFje8EHFBsiWzP5xjdmNgSFaQO6vRoZLgNQzLybp0 vrWKNLMwejZ1GYvudTvPhn8vaViUXP8KW7iDxs8CVhTg0U+YzMN9h3Y4J8TM+DJRuH/0 1Yt+/YvcnJA/rOx3tcgy5bXVdO5dQp9cRS9ulDTnjPLqXo2JDmK5u2kSf7vnZEW2PphS NNRsbgwSdhFtpi6oAnAj0NuKaV75HLeqqTQtYbdpnqy6jZOBtxSUIelV7lEbFBwBJ71o wgf5xZ7quT6Qk/AjL/B5EXczJCnGIKSHsmjKs2geHwKKkB59mhIq/7n7W+kXaNMXrRhb HoJQ== 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=XDBK5Er15QvjGUwykMjw01laGvht+dhKObLHHzorKRg=; fh=1zXyAWiTT+nfmFpKJAaIN8gEJa2odCsJ955kF1EbOYs=; b=u1bG72uBfHK3PBMYklER1Rt4lTD3R2z+Zeb8A6gPqmXghYQ5yFwVo834sed5wqWvIP Pw/jLmLkwuo2H8HPrxB5AZIlQ5HopqDuDZsoZXVNMuistbRnEIVib8TYq2UixHikm8ZE IL1FRcNqfYeW2hpdsSCuSWzBfei+IE3+xUtMU2XGq6zvcYcgxvFYS4/5qc+65aSS0KvT q49j1kztKTJIzx2Oyvgtxfvmz1Mh8IkvfISC3MqwZLkSQpiBmnEGN0USJ8X0CmAoDQL7 t/Y4qJyTLDti07wcmDUqN5lh5hgNzKfVy/aGZw9InpFFmYX0F4xEMx52tZkygVUZjilu rnGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=4MWOpEQa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id z1-20020a1709028f8100b001c754f13381si9669450plo.455.2023.10.09.11.29.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 11:29:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=4MWOpEQa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 23C258042393; Mon, 9 Oct 2023 11:29:31 -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 S1377392AbjJIS3X (ORCPT + 18 others); Mon, 9 Oct 2023 14:29:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376869AbjJIS3W (ORCPT ); Mon, 9 Oct 2023 14:29:22 -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 8EF7E9D for ; Mon, 9 Oct 2023 11:29:20 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-d9a4fb3e096so109176276.1 for ; Mon, 09 Oct 2023 11:29:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1696876160; x=1697480960; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=XDBK5Er15QvjGUwykMjw01laGvht+dhKObLHHzorKRg=; b=4MWOpEQarFiFDsKFVaQ3aoc0aWArpmmCr7Ejvi4R/zOtf5bc8UbGT44Rrg0MGMt3Oz hyIVziMJ0YlKpmUSit0Pyf/82m/G8SER7+pvfPLFs7u23uW4ENwws2JaUtFHvWihoUtR GCh0MZSyIlnxKstdd1EUdkYUV9wkB2UZSWZ0P+EvekUJspb9SpD0emiBSYa1oINLj1t5 vEZMkasLTdNMBgkjyWVfE0og4PRW+zTmWuqSu2pdi3yn/9WIVc3zo0KHZ8i/nnGyUBu+ OxHrqFra5yltxWydL1Lhc5Zt+evYp6nNniS3gWKvbS0QltS5Xdr33rifFmUXRyWLVQJg tOKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696876160; x=1697480960; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=XDBK5Er15QvjGUwykMjw01laGvht+dhKObLHHzorKRg=; b=cswZYC3djGBUDSaS5r205cqs/+TcYgQU/KgUTbb87RwGvYsT+94NC31+T0UCb/sD9Y jSNTdxj2Uv3lEX2WYki7dlTL8etNy/eRotDMHsf75/r3rfvUKD+XnAJ5x5ilB+SgyC82 NuFnG4PTM1ZwRMk/zqXG9fgEtYEas1heU9xJRBpLQFhLVtvQxfhvEE3GG8dxx/tiho6v F9Tvsv5kX49c+jVOyLPMfrb6QnPrlZ4rYBh4+BCSLDMcQAoL9gdHTi8PaINxQ/bPGCR/ c5HvV5dDrbj+uIB/0/4BO5T2yMTwB3iQNUJYc89WBWvCRTw0efV+RYfPXz7lNdq1ERsh DGTQ== X-Gm-Message-State: AOJu0Yzz+kQjce0Eog9qP72Ae5wI4NHDJhI2UZdX7JqJJqVX8dCcnT2Y G3+HCIUNY4809XlKcf5gbiZGgxq1WhXIes6qHg== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:ad50:0:b0:d78:2c3:e633 with SMTP id l16-20020a25ad50000000b00d7802c3e633mr230976ybe.2.1696876159847; Mon, 09 Oct 2023 11:29:19 -0700 (PDT) Date: Mon, 09 Oct 2023 18:29:19 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAH5GJGUC/x3NPQ6DMAxA4asgz7VkCNCfq6AOUexSD02RHSEQ4 u6NOn7Lewe4mIrDoznAZFXXb65oLw2kd8yzoHI1dNSFluiOXiynZUc2XcUcsxRkj/gp1yEQJuw pRQ63MA49Q80sJi/d/ovpeZ4/gDTkfnIAAAA= X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1696876158; l=1437; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=njDv3GAGmhVrExshk0hx5o9AbY/WD0+6gqoo2bn4Yhg=; b=1J2L7iU0ES7zC7vWFtN9NFGtdF0F81pv/JVQhRo8NZAZIpsJ+gGWhuCDrgOKhESE8tZUUsU3U d4Z2vnQKmFuD4VoXPdHgoaiP7YfJE2TD1dTaO5uvm7QNv0tFHL7+jAu X-Mailer: b4 0.12.3 Message-ID: <20231009-strncpy-drivers-net-dsa-mt7530-c-v1-1-ec6677a6436a@google.com> Subject: [PATCH] net: dsa: mt7530: replace deprecated strncpy with ethtool_sprintf From: Justin Stitt To: " =?utf-8?b?QXLEsW7DpyDDnE5BTA==?= " , Daniel Golle , Landen Chao , DENG Qingfang , Sean Wang , Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthias Brugger , AngeloGioacchino Del Regno Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.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 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]); Mon, 09 Oct 2023 11:29:31 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779303630551530456 X-GMAIL-MSGID: 1779303630551530456 `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 Acked-by: Daniel Golle Reviewed-by: Florian Fainelli Reviewed-by: AngeloGioacchino Del Regno --- Note: build-tested only. --- drivers/net/dsa/mt7530.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- base-commit: cbf3a2cb156a2c911d8f38d8247814b4c07f49a2 change-id: 20231009-strncpy-drivers-net-dsa-mt7530-c-40cad383654d Best regards, -- Justin Stitt diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 035a34b50f31..e00126af8318 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -836,8 +836,7 @@ mt7530_get_strings(struct dsa_switch *ds, int port, u32 stringset, return; for (i = 0; i < ARRAY_SIZE(mt7530_mib); i++) - strncpy(data + i * ETH_GSTRING_LEN, mt7530_mib[i].name, - ETH_GSTRING_LEN); + ethtool_sprintf(&data, "%s", mt7530_mib[i].name); } static void