From patchwork Tue Jul 18 22:56:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 122286 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2070110vqt; Tue, 18 Jul 2023 16:17:49 -0700 (PDT) X-Google-Smtp-Source: APBJJlExuyNBfSR8qrxZmN+QiK2fC5fEveue49YTIwtLO8YTLCxYwN78rWH4s7VCTud2oC7XVsgO X-Received: by 2002:a17:903:2449:b0:1b8:9b1d:d7fa with SMTP id l9-20020a170903244900b001b89b1dd7famr16257635pls.59.1689722268640; Tue, 18 Jul 2023 16:17:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689722268; cv=none; d=google.com; s=arc-20160816; b=ts4/F3GLRC31bDzIWPyQRIf106zsekT+E1Wc+Epd8Nbz7FJGufTslO7DN+O0IuJo+f 6TIFDSYIWpV8/A+Q6EOnxjzH9BsLMoRALcCd8TaP9hIY421ZuJwecHdEsZF/IQ2L7pr0 gr4jG7PUeYvrKiJlWYgN5EEZBkqr/SrLihnI0ANMEWcWvmaZnqjy+wowkHFB4+AMaW4I fAglwvpUhXGKAs4JewZPiU8Yq5XE+cU5Ref7sgrFzjDQNCCCiFFD0yCb5Vp1vX1MnUZe 2lBKTYo2O09kRfc6zBLRAxV6OZ/qjMbXyvfSrqzXkBeO1CQyX2oOUD4/o5LiR2bN8ufu p2cg== 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=JKTsUBdHf6mjrglthc3JKXEbljqtwfJ0Wa0XKyAwGoA=; fh=5+Vxm1wEDVUlNhpqen7YDBpFZ/29gQWMnIsWzj7ZFhI=; b=LO79k9+RN+PrFe2dZdNAOLJlJFjAYeBHaEggJwAHGeHAUJ8yt4sCoRIqaBL44aadhR Y7e2+MPvgRtwXoYx5etiJjX0krzWSNN1y4UGD4CMm/qdV2nkfLTbiB6zNG5nghBK5a/1 rkcM2BBFSMDUXCsxeF5bq1wBqjHEGkH/m7SNbItqyQLTLBdDCEqwUCOVPjH9WblHZmXk 06Yq28AXf0kiY7siw+6R6lCogStY3+b28tMUloAw4LzTjmNoIajfojb6wAV5mE1whM+H FRUXd/cbbu4OgJNOaN2/flJZmosg7d+6anf+63lrM/fkN3iS+UugDwV5Zooifa3Es6UJ J32Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=DsAK+7b+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d16-20020a170902ced000b001b03d54354dsi2378426plg.189.2023.07.18.16.17.34; Tue, 18 Jul 2023 16:17:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=DsAK+7b+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230130AbjGRW4r (ORCPT + 99 others); Tue, 18 Jul 2023 18:56:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229452AbjGRW4p (ORCPT ); Tue, 18 Jul 2023 18:56:45 -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 54005E0 for ; Tue, 18 Jul 2023 15:56:44 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-cad564b45e1so5245153276.2 for ; Tue, 18 Jul 2023 15:56:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689721003; x=1692313003; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=JKTsUBdHf6mjrglthc3JKXEbljqtwfJ0Wa0XKyAwGoA=; b=DsAK+7b+KhUIfLn5uvVmAgBbjA/+sjrZYzO4DVVMQgvgR3oP5/HamLWwUMfW1p5vok eRsHnOVW+5VV+uausCTw6SL5XiZlNjdNj3b5wiTmrC5I+IW0xaK4M/17h45cIXAzHFI8 FmwNcBBLJgZZHLHgQw3ENz2EXvLg0+pq5KJkFotTQoyH0EgwOkpKFGo2Hw7jK2ZmC0qo o8KBqCPmk4efYXUGj8axuFWt0iOYHltU5W7qjDQAQjfE+Am2aN202o4UpFdySp2gzpAz C4jdMGG9X7Ghk3sHwhYODDiarfsuVr17ViucIN7TMsUeViiorpy3x1TRqzfuKClOVxWL jYFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689721003; x=1692313003; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=JKTsUBdHf6mjrglthc3JKXEbljqtwfJ0Wa0XKyAwGoA=; b=j38XIu20r3DT6DpF/j/VwqDtSNykT/okNWwvAynhucyUBiqs2Syd5SlPiLg1Vb4y3V yMKJvHFsY8kU4jhaTcUDs0rZNiQlDFPB5aNtD1LTzI4pCUkMsfXtN6EZDK38u9PZdJlv 2Krima/mZXunWzZ2CNkSP0mxgf4fNaZrq40NtpG0JRSb0xbyaUpuB0YK/Uoz8D4DJ0tr x7coyDszuu4L5UcTxizygD8bNzCaGgS63IzZvqVPTnqm4rEeFk64cugjpQFrme7mQxtV S24KplVJi2Xe9HyQNoEdF/pz7zGVAeHSB0Pn3UCgD0v0ZxTGm/MjxQK8PYtmpfQv8yE8 anYQ== X-Gm-Message-State: ABy/qLbeWQ3I08YlmyKjKMx72GqTlEPo3sdRg8+K4K2eBSLhACmkunP5 qMVwqWUOnARSHg//yIyPNRwsbZgZA4Ys/tA78A== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:b2a4:0:b0:ce8:f8ac:c979 with SMTP id k36-20020a25b2a4000000b00ce8f8acc979mr10152ybj.1.1689721003510; Tue, 18 Jul 2023 15:56:43 -0700 (PDT) Date: Tue, 18 Jul 2023 22:56:38 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAKUYt2QC/5WNQQ7CIBBFr2JYiykMdNCV9zAuEKYtiRYDTaMxv bvYlYtq0tm9Sd77L5YpBcrssHmxRGPIIfYF5HbDXGf7lnjwhZmsJFQokPc0cJ8tz0Pq3f3JjVL OinJ0kaxY90RNeMzF07lwF/IQ03MeGMXn+7s1Ci64lIigrdh70Mc2xvZKOxdvn/Z/EaXzjWr22 nuzSrSgsQYgkJeVi84AOLBCV9WyaJZFMqquFSpEAd/ieZqmN/O1LpeTAQAA X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1689721002; l=2431; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=12Invee2F46gxBoPTo2ea7wJxLDZIoaUSVi90l6hl/A=; b=OYb+IwNf7reduFC3/7/pdOdfLntzT7A3k9gUneK/SJVzEuBJVWxUB8X0Z+RkaQuyzFJGnvMqW cc9BBYDEykPD6lvE+aIwAq9EDEj96mvNmkhMsqlw5EjWsnUBN4FlXPc X-Mailer: b4 0.12.3 Message-ID: <20230718-net-dsa-strncpy-v2-1-3210463a08be@google.com> Subject: [PATCH v2] net: dsa: remove deprecated strncpy From: justinstitt@google.com To: Justin Stitt , Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Kees Cook , Nick Desaulniers 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,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED,USER_IN_DEF_DKIM_WL autolearn=ham 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771802217166206594 X-GMAIL-MSGID: 1771802217166206594 `strncpy` is deprecated for use on NUL-terminated destination strings [1]. Even call sites utilizing length-bounded destination buffers should switch over to using `strtomem` or `strtomem_pad`. In this case, however, the compiler is unable to determine the size of the `data` buffer which renders `strtomem` unusable. Due to this, `strscpy` should be used. It should be noted that most call sites already zero-initialize the destination buffer. However, I've opted to use `strscpy_pad` to maintain the same exact behavior that `strncpy` produced (zero-padded tail up to `len`). Also see [3]. [1]: www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [2]: elixir.bootlin.com/linux/v6.3/source/net/ethtool/ioctl.c#L1944 [3]: manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html Link: https://github.com/KSPP/linux/issues/90 Reviewed-by: Nick Desaulniers Reviewed-by: Kees Cook Signed-off-by: Justin Stitt --- Changes in v2: - include string header (thanks Nick) - add reviewed-by trailers - Link to v1: https://lore.kernel.org/r/20230718-net-dsa-strncpy-v1-1-e84664747713@google.com --- net/dsa/slave.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) --- base-commit: fdf0eaf11452d72945af31804e2a1048ee1b574c change-id: 20230717-net-dsa-strncpy-844ca1111eb2 Best regards, diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 527b1d576460..48db91b33390 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -21,6 +21,7 @@ #include #include #include +#include #include "dsa.h" #include "port.h" @@ -1056,10 +1057,10 @@ static void dsa_slave_get_strings(struct net_device *dev, if (stringset == ETH_SS_STATS) { int len = ETH_GSTRING_LEN; - strncpy(data, "tx_packets", len); - strncpy(data + len, "tx_bytes", len); - strncpy(data + 2 * len, "rx_packets", len); - strncpy(data + 3 * len, "rx_bytes", len); + strscpy_pad(data, "tx_packets", len); + strscpy_pad(data + len, "tx_bytes", len); + strscpy_pad(data + 2 * len, "rx_packets", len); + strscpy_pad(data + 3 * len, "rx_bytes", len); if (ds->ops->get_strings) ds->ops->get_strings(ds, dp->index, stringset, data + 4 * len);