From patchwork Mon Oct 9 18:34:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 150259 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp2053632vqo; Mon, 9 Oct 2023 11:35:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGKnUHz7aD1mJZsCLeJyOsobkufrlIx6Cx6/6TIGQ4ynGrPebPrBVf//3GeTrbJGQ070Y9x X-Received: by 2002:a05:6808:16a6:b0:3af:9838:8494 with SMTP id bb38-20020a05680816a600b003af98388494mr20456037oib.20.1696876531582; Mon, 09 Oct 2023 11:35:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696876531; cv=none; d=google.com; s=arc-20160816; b=CJuIFHwswRKP6KFpqshMMOkl7+/sP01sqm71hXF40p0ZET6VxmS+/z+UIOAXtq/wfV NQxzQzT3iWeNtXWPN1YG58sB4lJxY24Xr4aj0GORH6qL6SbgffxlSyRyemPpzaHAzCXf NmG15TY4t5kOhS8XHIM0qVTLOpIcTVRw5Idr3qElg68rTWU29FQqKcQirjaJ6/YSg0O2 4Zu4I2NPnvI8ImkVdzjlTJyEcDv0Dwld3niBc2RRlWJ3GEsZTxwi/zsNSb9unRu5qJx2 mCa05Z81MqXTyQcxmqytFsr7l/3iQ9MZH9og80XH+KEiMqK7yuUG5tTwePT5W6ujXNLQ Kxzg== 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=bM4vdckG8rnY8B9pZotgnlGAv6uavP2L8KjGx2+6gvw=; fh=+nR/KBYVMP75b/5EkORvVk3R3PpmbJKGYQ7gn75EMlo=; b=bEdfM1XPy9EvQZ5oXKCo0RXLH55uZ12pKZAycfEhSRQbuTwjEBrq74mqm53YZTeES9 0v1HjdCsMyLBafbzkwhZu5vttumrS43vsFPQ13hSueQKciigAskSPqXVLzY0SqSOs9ft A3lCyERiMu4wEP9PctwQAW5rOehnZ5CEtrJ+wihIfgBC3o0hA/wA8339DMY4NvsxAKFS /rqm1gQDtbTuN7ZuRszTeCOzsKU2ro85Fm1DRvLRlR27ToZbIROp+cPedGtAC6yXed37 0C/LUE+Q2MxuG/wGAx/k2ddhnnwbYrzrbjX2e5W6o5eUTO798oXtVuRy49BT6uQpjJpG HY4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=xZH9r6R6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id z26-20020a63191a000000b00563a0bacbb4si10118589pgl.694.2023.10.09.11.35.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 11:35:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=xZH9r6R6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (Postfix) with ESMTP id 8B178801B381; Mon, 9 Oct 2023 11:35:28 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378201AbjJISfQ (ORCPT + 18 others); Mon, 9 Oct 2023 14:35:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378082AbjJISfC (ORCPT ); Mon, 9 Oct 2023 14:35:02 -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 916FCD61 for ; Mon, 9 Oct 2023 11:34:46 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-d9a3e0f8872so644302276.0 for ; Mon, 09 Oct 2023 11:34:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1696876485; x=1697481285; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=bM4vdckG8rnY8B9pZotgnlGAv6uavP2L8KjGx2+6gvw=; b=xZH9r6R6hvMY68Tiu3kpxICYzqQU7DV9Ehb/DiweNr4TSZB0dUV8rz1exoiibYEpal Uh7HGc7YYn173RlkOrHG94VBRnrNoNLHpUzDvnlJYKDdThv7A7Qne0fxigSMQ7NsMIsF wVir/Ab7d5KHeH4O2x8p07s28fAtSk6xRBzWVJvQZiK+DzOW0583kXdVYu/L3TBeknOJ OXYkXK8c9YkXO8SePZflGPT288tE+qM9BiWYl8p8Pcr0E93x5r+WpuuU0ambtsyX1j2z RG1Kzuaiv76PghMoa7D/L/5KF+pxj2zKRAiUA3kPXZ5ImczIScSkzIhmUCE7Bt6Ns2IK Z7KQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696876485; x=1697481285; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=bM4vdckG8rnY8B9pZotgnlGAv6uavP2L8KjGx2+6gvw=; b=hOnYB13PqL3H3npV7KVAuDcax42N3xGPka/0n9z3mS1rxPT94rQ/pKBPm0X+9rcWev 2hcsa+24q+U2ZKnUD8cn0SyJF5HWP+YSNkQIVT65moK5z+fWBiADZCivhfhhf3SmGcdc kJkaKg8sX9jdWdOcEgU/LntwVkKSjSYYQZyqoyfSQhREhYZHHEyyDLvvvhqEbPWgPry/ JdiVK7cZHBv66CR0xGXuX+uwOivOFyWtSm5+uFZ+FX/57PjJtvh7ynEryy2ygnLc8P5K jb/4I/t/rYMGs4PylF3IQPgkUm46yNwWEJocYtSvtjMw3NeSMFJcNvgLZT+UFIr80M7m f4gw== X-Gm-Message-State: AOJu0YwyPFODPsNIRxKo2WtgTsr8IXuUGw1yt7/1lrHmSQ2949lOTXua z4kz0YZxX+5xJ7ZeUexLbgqak3E8Xio84ky4Mw== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:ca11:0:b0:d89:42af:d46f with SMTP id a17-20020a25ca11000000b00d8942afd46fmr249115ybg.12.1696876485366; Mon, 09 Oct 2023 11:34:45 -0700 (PDT) Date: Mon, 09 Oct 2023 18:34:45 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAMRHJGUC/x2NMQ6DMAwAv4I811IIDLRfqTqAbahVkVAbISrE3 xsx3HDL3QEupuLwqA4w2dQ1pyL1rQJ692kSVC4OMcSmDuGOvlqi5Ydsuok5JlmRvccvXXQfpDz POSEhc6SuHWIz8AgluJiMul+z5+s8/1JexLp8AAAA X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1696876484; l=1550; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=72/H5p/SqqXCeml5lTqSbORWxP5Dde/Rx27bjYoRkyI=; b=uiIFKsYNOtyGmZZuRJCdtAqcUUTlXBnxMGZ7beN4zUUJbUF5DJ7nGEjqPX9DJ4N7NrHcNyVwn 5RXoS8GIPeZDyfLDD4QRTM4rqMjNrzqzx7FnEz2V2ZPC7M66FEmogNL X-Mailer: b4 0.12.3 Message-ID: <20231009-strncpy-drivers-net-dsa-qca-qca8k-common-c-v1-1-34c8040e0f32@google.com> Subject: [PATCH] net: dsa: qca8k: 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 morse.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 (morse.vger.email [0.0.0.0]); Mon, 09 Oct 2023 11:35:28 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779304005727275251 X-GMAIL-MSGID: 1779304005727275251 `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 Reviewed-by: Florian Fainelli --- Note: build-tested only. --- drivers/net/dsa/qca/qca8k-common.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- base-commit: cbf3a2cb156a2c911d8f38d8247814b4c07f49a2 change-id: 20231009-strncpy-drivers-net-dsa-qca-qca8k-common-c-dd2c84b23bdf Best regards, -- Justin Stitt diff --git a/drivers/net/dsa/qca/qca8k-common.c b/drivers/net/dsa/qca/qca8k-common.c index fce04ce12cf9..9ff0a3c1cb91 100644 --- a/drivers/net/dsa/qca/qca8k-common.c +++ b/drivers/net/dsa/qca/qca8k-common.c @@ -487,8 +487,7 @@ void qca8k_get_strings(struct dsa_switch *ds, int port, u32 stringset, return; for (i = 0; i < priv->info->mib_count; i++) - strncpy(data + i * ETH_GSTRING_LEN, ar8327_mib[i].name, - ETH_GSTRING_LEN); + ethtool_sprintf(&data, "%s", ar8327_mib[i].name); } void qca8k_get_ethtool_stats(struct dsa_switch *ds, int port,