From patchwork Thu Oct 12 22:21:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 152204 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp1530774vqb; Thu, 12 Oct 2023 15:22:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEAkbIPFp9K1heuF7QM5VbHwCKz+bxez1szB7yVXPaMenySH2fDf8HuHDzdufw7UMrcvmHB X-Received: by 2002:a17:902:da87:b0:1c6:2902:24f9 with SMTP id j7-20020a170902da8700b001c6290224f9mr28776468plx.1.1697149323556; Thu, 12 Oct 2023 15:22:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697149323; cv=none; d=google.com; s=arc-20160816; b=N9x14QZPYXjF6I0kb9BV9W1RqukMmLppJKQfJ6OzY5TpJk2CKoJ1u+gwYZ1whs8sHF dZzcGJdxmIo6DdGRZXkWNg1j72sQ/QgGuIppK04O4nB21sF9VnceOSuN9D6CYmxA815+ 6wjaK4lA2015ImZb4KPS/ImQG+5DOuRE2+UWVjy8pjeYBCuzwamc5iaq6BQXNzDgAyxc kCPxz2aUzOdr9A4IqhIR3Ff+aQUOAfccfU0mgFC3C/5BtqaLR21UTpbA19ndKr8+i6yI GXU4iBZNMQTN2Di40kyF1enmfS8B7vu9XtUpeRqXz0tPRvCk24zANRGMBc1bJbixb4i7 36Kg== 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=bh+hSER4C1DvDn14bvbdLI9ZreonMjP5eqcJAKaJwbM=; fh=jNFzfs0LVcNPJYpz3MO9rP5uq1TU3TrcBg7mkF9EWrg=; b=NQcllpNjoow0+7+Sn34hBRYFqgYXxJ/lsFouMQJJfQk5HZCgdAcSyS9nX0OxieGj/o rJftzOOOOOCrr58/sKuCEoE9YX1jpf8hCPVCnHI7Lrt8bd8WgYaw20zZP1j6w00NphO9 W8NMZZ4r2agjtebfkx+WpRFYLU+MD7zdSapyBZSb/h5+V+qQuavwrOq0fev8BBkqMrOI YNrfTvMV8uYey9F7ZyGRwemIRRtsmkHpeeovDbasCOV0yWA0lZlXMtuGecx4M24Avj5U 4fbrq/UggNWGS92o49wT6A9trTzFByIpQbqoyVt51pKEwNed0H+AxtUhqnGZCE3py/9G F3mA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=iPCU1tNM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id a4-20020a170902ee8400b001c9dfd47959si2472530pld.602.2023.10.12.15.22.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 15:22:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=iPCU1tNM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (Postfix) with ESMTP id 77FCF829A56C; Thu, 12 Oct 2023 15:22:01 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442989AbjJLWVv (ORCPT + 19 others); Thu, 12 Oct 2023 18:21:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1442949AbjJLWVu (ORCPT ); Thu, 12 Oct 2023 18:21:50 -0400 Received: from mail-ot1-x34a.google.com (mail-ot1-x34a.google.com [IPv6:2607:f8b0:4864:20::34a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E07DCA for ; Thu, 12 Oct 2023 15:21:48 -0700 (PDT) Received: by mail-ot1-x34a.google.com with SMTP id 46e09a7af769-6c6373a4aa7so2082359a34.3 for ; Thu, 12 Oct 2023 15:21:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1697149308; x=1697754108; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=bh+hSER4C1DvDn14bvbdLI9ZreonMjP5eqcJAKaJwbM=; b=iPCU1tNMlM8fq/StWad5u6JvS3cquovX1dQ7Ea1IymTdRFRRl3iexFyr+HCQsfIZMk fMyFSeVt13lcPo13BgTMCSay3qxOVPO4BRz3Efv/32kyxlrtuUFgXpPX1DfFnn3x/sud SZI4QUUxlfN5/tNTpuFgXKtoJKoRBLQpvc8HqQbRTPHYvC+cHp9lLndPflejkNXt7PHn GImWL/NnTWUEEspM3WuUaOEQ8EsKOR8BfQD/Dk22ARmfDOfJQnuvT/EFVF5TqBpVApRL lpVtdt3jACxeAligAklDGCwlmUZWrsEp26q1riBtzpk8UqKEZExAlb5Rdejs9OCiacCd zgmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697149308; x=1697754108; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=bh+hSER4C1DvDn14bvbdLI9ZreonMjP5eqcJAKaJwbM=; b=nFBqsSFXXkHXwQ8DfKh7m5KlpVQN5B8vFbPpqsG5jXuW/1LRzub7tIZ1X5sxKlJae0 RaD/51FnOdBBY6XxJEMFbVW7DMnvFdls2j0P6VCTvqCeGUHLUiHxQ6smlUkRrmG/l6he xUiAGgsOfTrd00+m4Ft/iX22XfvSpGQtRm8azycSaQ1/lbdBfOm37q/Vm/EpXpki0n9n iYH9G2mWcz84foNO0b+KPKC9QabXUOeUxqjXcumDWIySyXjeL4vTo8eVqxjol5BoqDYy XQni5uGG93fefcRh9pLuXJ+dB/HspVPC1oaX8aLn+IEv+CzltWKvvawifaJKu6Bb4i3I lTPA== X-Gm-Message-State: AOJu0Yx0wTDu1JCruQblcq6ZssV8404Q7X1cl5ylF83iaqrwJmGsCeXY /Yzqv0xAmAMwtJNnwGV/c99aGpLT08U55WMYgw== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a9d:6656:0:b0:6bc:e2b0:7446 with SMTP id q22-20020a9d6656000000b006bce2b07446mr7467981otm.1.1697149307832; Thu, 12 Oct 2023 15:21:47 -0700 (PDT) Date: Thu, 12 Oct 2023 22:21:40 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAHNxKGUC/x3NwQ6CMAyA4VchPduElTDRVzEedFTppS7tQkYI7 87i8bv8/w7OJuxw73YwXsXlpw3h0kFaXvpllLkZqKch9IHQi2nKG84mK5ujcsG8bKg1Y3qXigk pRprGONF1vEELZeOP1P/k8TyOE0WheCx0AAAA X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1697149306; l=1461; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=zDm0tM3C96zS13DwXvkwxj+OZciNm9xmIb8vZS7nYHY=; b=jaA6cIlF3bF8PEtTlY+0c10ULOr8mzf5f1MLSNvU6GhIHm6sizPmiWvq3MVNeND9xeoYnl19y ETVPyKnbhIwAw97CRcGjpx3d4lEbCCtDsTHw38ivP6HbK7bYoYycjkv X-Mailer: b4 0.12.3 Message-ID: <20231012-strncpy-drivers-net-phy-nxp-cbtx-c-v1-1-4510f20aa0e6@google.com> Subject: [PATCH] net: phy: replace deprecated strncpy with ethtool_sprintf From: Justin Stitt To: Andrew Lunn , Heiner Kallweit , Russell King , "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=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.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 (lipwig.vger.email [0.0.0.0]); Thu, 12 Oct 2023 15:22:01 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779590049190449688 X-GMAIL-MSGID: 1779590049190449688 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 dedicated helper function. 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: Andrew Lunn --- Note: build-tested only. Found with: $ rg "strncpy\(" --- drivers/net/phy/nxp-cbtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: cbf3a2cb156a2c911d8f38d8247814b4c07f49a2 change-id: 20231012-strncpy-drivers-net-phy-nxp-cbtx-c-266285682759 Best regards, -- Justin Stitt diff --git a/drivers/net/phy/nxp-cbtx.c b/drivers/net/phy/nxp-cbtx.c index 145703f0a406..6a2c0c193255 100644 --- a/drivers/net/phy/nxp-cbtx.c +++ b/drivers/net/phy/nxp-cbtx.c @@ -182,7 +182,7 @@ static int cbtx_get_sset_count(struct phy_device *phydev) static void cbtx_get_strings(struct phy_device *phydev, u8 *data) { - strncpy(data, "100btx_rx_err", ETH_GSTRING_LEN); + ethtool_sprintf(&data, "100btx_rx_err"); } static void cbtx_get_stats(struct phy_device *phydev,