From patchwork Mon Oct 9 22:54:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 150380 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp2161589vqo; Mon, 9 Oct 2023 15:55:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGhYai2Q2TKPHhMsGrvVsb3VarIBAgMtyeaTFvS/NG5rO41ZgzwXQ4i5g959IQlvqFASkKJ X-Received: by 2002:a05:6a21:1f27:b0:16e:ab42:9837 with SMTP id ry39-20020a056a211f2700b0016eab429837mr3118629pzb.29.1696892103367; Mon, 09 Oct 2023 15:55:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696892103; cv=none; d=google.com; s=arc-20160816; b=TSNU3EEPc68qZmo9q4w/Jxr0H5UeA0OUpPSbeJwWPeWoxvk4bxqmhPRKgGttTHHj0O +tAzmYnrQhLXhUNMZUlDzoWAF5m8ea0+ljtzJXD6fxoDINUSnp1xeLDcjctaoYwZlmBW IvysnB4j+tz8exdEUq6l+zUQfq8gIAyQgkwhVlQWe/44SR5hT2kmYjr2AKyDGmVvg27C /2IJY7gVnlACPqYs9zO+g50kCokYHEXunClsO/WjDgBbSWdz4/CaRFviq22Xx8jghFUl br/pndfvdwH8+zSaz2Id7bW4eRaTEjLb71NjGJpJ3e3oSaI72ay3JJpi8p5ogM98iUGb qdxw== 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=gqq3YrEYGFNss40u9rh8HNKvaODfOxHAaOpSCan2mbI=; fh=+nR/KBYVMP75b/5EkORvVk3R3PpmbJKGYQ7gn75EMlo=; b=YG3Hd1kCT3RY5og34l6OURZ/5qk5sm7GC6XOYSeFcwPtYavmGGtD595rvzZAcDWPFt 0sWVOExMuazpPZ21p1HelwLbI6L4QteS0FA3TypXd2+b/oN3ywkzj9ctGaQ/V2qVl814 VhAa/DVMRExCDtdKzSyuRW5S+ZGduySThkxCq3tdOnxUG2frG/hS3dEE/aca9qxJEPPW X+1EYHaVDsulweg1yKHUfsOLJx+iW/NMjnBe17/j6e38semoCVxZbiB+B0YSpqz74yLn D/12xeC93ORlzjb5UxUNIef3CADyb2hLO8RjJOuE3+q5DoStAmOrbjvg1a/jPnNe3RWX Wtwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=PKj54VcP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id z8-20020a170903018800b001c9ad75c067si720695plg.149.2023.10.09.15.55.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 15:55:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=PKj54VcP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (Postfix) with ESMTP id 9E49D81F54F2; Mon, 9 Oct 2023 15:55:00 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378947AbjJIWyo (ORCPT + 19 others); Mon, 9 Oct 2023 18:54:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378937AbjJIWym (ORCPT ); Mon, 9 Oct 2023 18:54: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 78FC6A4 for ; Mon, 9 Oct 2023 15:54:40 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-d9a581346c4so122778276.0 for ; Mon, 09 Oct 2023 15:54:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1696892079; x=1697496879; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=gqq3YrEYGFNss40u9rh8HNKvaODfOxHAaOpSCan2mbI=; b=PKj54VcPH+Y3gu4/HHgNOJ9DfmDHm6YbJEZXlYMV3+hgRoJKbx0VkdX4ScjK8rytGf 18g5ZhBi3KwCC/QXw5THS1mlkXnODg9v6BHb8R/UvqvSgUhHh9lFu4a/y3OIvNt9S2Tj p5YrR4ZgaEODegXEILQNCVGYi/SdUGXifWhTUblPsXBZo31hOOz53YzfiXzya+f3r5rv LR0BcgQ5CPZuzHkINS0xAP4P+eun8qIpOj68kgtv4PtuRQVxAFMy1XvZ1K+YF4M25QsU 5dh4VBA3FFfJ+9y+uWgs+hiPjci+M6RcSmy0gtHWPx3BzJd5NdGBGu+TaQ8y09nY3tj6 IwCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696892079; x=1697496879; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=gqq3YrEYGFNss40u9rh8HNKvaODfOxHAaOpSCan2mbI=; b=hX6CuiWzfied7N0v54Uu2k9H9Ru/x6RcX+AKMUSbuF0zLFRmUNHfRuoidQJwF1FSXP UQjpbkVA2F9NjlFaSLGssdxDTCL0ghc3Gk4u1FuwvwgKf+gT6etJr0A/iX/Mb0vDms1X euEK50FUv1/kg7j+Fb8irjUjMBVGr8RmVw8mMJANKDr+yIaQJEz1s80KvJpzxBag6D2h yVYPoML1Z7FpI/FoXox/U9OauOJnp0abTWX9cP3KL1V8HKuDKeeWZ8HDb/KZFioZI3sd xX003EoOpYgnfgXtJonICUt4AgtwdFy5JF3Fw0OhjIzrt5fFjH7gr4griNwHf1ujHS93 U3lw== X-Gm-Message-State: AOJu0YwH/zpMU2eNH6tgghI9j0mD4EGrnIfE1Ah1GtkWKwYtXQahjfRO pyq6Zxd2ddY7sGVXwdF9vG3Rf6b5ohsv+mJmKA== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a05:6902:85:b0:d86:5644:5d12 with SMTP id h5-20020a056902008500b00d8656445d12mr302836ybs.4.1696892079757; Mon, 09 Oct 2023 15:54:39 -0700 (PDT) Date: Mon, 09 Oct 2023 22:54:37 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAK2EJGUC/x3NPQrDMAxA4asEzRXYztCfq5QOrqS0WpwgGeMQc veajt/y3gEupuLwmA4waeq6loF4mYC+uXwElYchhTTHEO7o1QptO7JpE3MsUpE9Y9Mq7oLN6Tr 3jrSaIGGkhUOmxLf4hhHdTBbt/+HzdZ4/cFU+pYAAAAA= X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1696892078; l=2762; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=dnJs1bo1eq2tjq6VR/G42QgTFZ/5UULFEzYTX6dAjz4=; b=Gq6P/7az6Lfl/v56lJyGITjEvb9rCpFg5YZenKeB6EJWQNAyLr6rUZWZOEeJ810Sy56KUkrud LUyx/1GXlWXAjWqd+7FHFUHndSQrvYl4rzI6v7iqGR6dDD3FqnY6y7Z X-Mailer: b4 0.12.3 Message-ID: <20231009-strncpy-drivers-net-dsa-vitesse-vsc73xx-core-c-v1-1-e2427e087fad@google.com> Subject: [PATCH] net: dsa: vsc73xx: replace deprecated strncpy with ethtool_sprintf From: Justin Stitt To: 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, 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 fry.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 (fry.vger.email [0.0.0.0]); Mon, 09 Oct 2023 15:55:00 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779320334005248524 X-GMAIL-MSGID: 1779320334005248524 `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: Florian Fainelli --- Note: build-tested only. --- drivers/net/dsa/vitesse-vsc73xx-core.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) --- base-commit: cbf3a2cb156a2c911d8f38d8247814b4c07f49a2 change-id: 20231009-strncpy-drivers-net-dsa-vitesse-vsc73xx-core-c-1cfd0ac2d81b Best regards, -- Justin Stitt diff --git a/drivers/net/dsa/vitesse-vsc73xx-core.c b/drivers/net/dsa/vitesse-vsc73xx-core.c index 4f09e7438f3b..09955fdea2ff 100644 --- a/drivers/net/dsa/vitesse-vsc73xx-core.c +++ b/drivers/net/dsa/vitesse-vsc73xx-core.c @@ -928,7 +928,8 @@ static void vsc73xx_get_strings(struct dsa_switch *ds, int port, u32 stringset, const struct vsc73xx_counter *cnt; struct vsc73xx *vsc = ds->priv; u8 indices[6]; - int i, j; + u8 *buf = data; + int i; u32 val; int ret; @@ -948,10 +949,7 @@ static void vsc73xx_get_strings(struct dsa_switch *ds, int port, u32 stringset, indices[5] = ((val >> 26) & 0x1f); /* TX counter 2 */ /* The first counters is the RX octets */ - j = 0; - strncpy(data + j * ETH_GSTRING_LEN, - "RxEtherStatsOctets", ETH_GSTRING_LEN); - j++; + ethtool_sprintf(&buf, "RxEtherStatsOctets"); /* Each port supports recording 3 RX counters and 3 TX counters, * figure out what counters we use in this set-up and return the @@ -962,22 +960,16 @@ static void vsc73xx_get_strings(struct dsa_switch *ds, int port, u32 stringset, for (i = 0; i < 3; i++) { cnt = vsc73xx_find_counter(vsc, indices[i], false); if (cnt) - strncpy(data + j * ETH_GSTRING_LEN, - cnt->name, ETH_GSTRING_LEN); - j++; + ethtool_sprintf(&buf, "%s", cnt->name); } /* TX stats begins with the number of TX octets */ - strncpy(data + j * ETH_GSTRING_LEN, - "TxEtherStatsOctets", ETH_GSTRING_LEN); - j++; + ethtool_sprintf(&buf, "TxEtherStatsOctets"); for (i = 3; i < 6; i++) { cnt = vsc73xx_find_counter(vsc, indices[i], true); if (cnt) - strncpy(data + j * ETH_GSTRING_LEN, - cnt->name, ETH_GSTRING_LEN); - j++; + ethtool_sprintf(&buf, "%s", cnt->name); } }