From patchwork Fri Dec 9 07:38:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 31676 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp634580wrr; Thu, 8 Dec 2022 23:50:18 -0800 (PST) X-Google-Smtp-Source: AA0mqf5/sr80od/b3gKC+eKlOLK7Aw06+TxqFCj3Wf9GM47rF+tFR1Xl2sMH5kLb5Vx9GJXDcPBW X-Received: by 2002:a17:90a:7347:b0:213:b6c8:2295 with SMTP id j7-20020a17090a734700b00213b6c82295mr4761604pjs.22.1670572217895; Thu, 08 Dec 2022 23:50:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670572217; cv=none; d=google.com; s=arc-20160816; b=ZjF4NS6w1RwYBtETUXN7QSjhlILQNPVXNw2JYkf7w9gmDvxhlZEWByh+nVmu+g3bd3 mgXIJVwhclhO+VkkGIWexSi/qV0wbLD2ThwJ6qj1eAnfxNtGkZhXwWWXE0zYbumZz9kv inTm/ZQ05M3nDz4Vta1t/EZ/lsMVYwo3w4NGfiaGDeixHo5UIZDI8vAyvANlnlQAboac g/dqBJXP/qeZCVLCvAkMd0cMO3Rpf4k9JTu/KdXzoCfcjeck3b8HYLT71dAh7vrMudyH aGuLfjhOaIn4oQxhOf4VyJe/ZKjFx4BshdIfrY1INZgoJV0t5/HxmOFCFsTDSFuA3Xy3 4Qag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:mime-version:message-id:date; bh=ZNzgGD4eBJKo6ic8ykkKonOmtt1IavZ7PD4DrvAvA2w=; b=Ko1X7X1DTA5aIuAefkg9nCUOyC2XH3ci2vTlYD1MrVchWM33UHR1YGHdfuXGDmt453 6ALncz6/kkck4/030KmHAESXFRmhjQ7/FlVs7LpF7TIkK9IMUK8n/0v3W/7UGdPfD1t6 SVZ2LuUhCF0CYyaZQxe0QT2OALBHLNSEr/FEwX9Yh2yaIYna/cR0M9xfYCLSwYGDwJ0/ Zyi43uguAfZ46x3h6aKNfmxKXWJdUGWJV4RKDyv9B5OX8RaDIbY7akil1QPOVpqeC89o 4xLJokQe+Skm555QsU6eg8z+nVBPb6nCVXXTWxHtmvYrULUKwnTigUCUQG2zVJB2r76o aQZA== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e37-20020a635465000000b0047841428c4esi832737pgm.787.2022.12.08.23.50.03; Thu, 08 Dec 2022 23:50:17 -0800 (PST) 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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229992AbiLIHjK (ORCPT + 99 others); Fri, 9 Dec 2022 02:39:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229550AbiLIHjI (ORCPT ); Fri, 9 Dec 2022 02:39:08 -0500 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3818345090; Thu, 8 Dec 2022 23:39:07 -0800 (PST) Received: from mse-fl2.zte.com.cn (unknown [10.5.228.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4NT2vs60Wnz5BNS0; Fri, 9 Dec 2022 15:39:05 +0800 (CST) Received: from szxlzmapp04.zte.com.cn ([10.5.231.166]) by mse-fl2.zte.com.cn with SMTP id 2B97cv5J009991; Fri, 9 Dec 2022 15:38:57 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp04[null]) by mapi (Zmail) with MAPI id mid14; Fri, 9 Dec 2022 15:38:59 +0800 (CST) Date: Fri, 9 Dec 2022 15:38:59 +0800 (CST) X-Zmail-TransId: 2b066392e613190d3cc0 X-Mailer: Zmail v1.0 Message-ID: <202212091538591375035@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , , , , , , Subject: =?utf-8?q?=5BPATCH_net-next=5D_net=3A_hns3=3A_use_strscpy=28=29_to_?= =?utf-8?q?instead_of_strncpy=28=29?= X-MAIL: mse-fl2.zte.com.cn 2B97cv5J009991 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.138.novalocal with ID 6392E619.002 by FangMail milter! X-FangMail-Envelope: 1670571545/4NT2vs60Wnz5BNS0/6392E619.002/10.5.228.133/[10.5.228.133]/mse-fl2.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 6392E619.002/4NT2vs60Wnz5BNS0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751721934439158594?= X-GMAIL-MSGID: =?utf-8?q?1751721934439158594?= From: Xu Panda The implementation of strscpy() is more robust and safer. That's now the recommended way to copy NUL terminated strings. Signed-off-by: Xu Panda Signed-off-by: Yang Yang Reviewed-by: Jiri Pirko --- change for v2 - change the subject, replace linux-next with net-next. --- drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c index cdf76fb58d45..55306fe8a540 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c @@ -639,13 +639,11 @@ static void hns3_get_drvinfo(struct net_device *netdev, return; } - strncpy(drvinfo->driver, dev_driver_string(&h->pdev->dev), + strscpy(drvinfo->driver, dev_driver_string(&h->pdev->dev), sizeof(drvinfo->driver)); - drvinfo->driver[sizeof(drvinfo->driver) - 1] = '\0'; - strncpy(drvinfo->bus_info, pci_name(h->pdev), + strscpy(drvinfo->bus_info, pci_name(h->pdev), sizeof(drvinfo->bus_info)); - drvinfo->bus_info[ETHTOOL_BUSINFO_LEN - 1] = '\0'; fw_version = priv->ae_handle->ae_algo->ops->get_fw_version(h);