Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp942914rwb; Thu, 8 Dec 2022 05:05:03 -0800 (PST) X-Google-Smtp-Source: AA0mqf5mBQjCua9nHgq2ELVsDHCy4jti3PdW+j3OmNB8BG2nts8uVMSEwwnS27DZS44C65Ey9hBC X-Received: by 2002:a05:6a00:2444:b0:558:991a:6671 with SMTP id d4-20020a056a00244400b00558991a6671mr78386161pfj.58.1670504703004; Thu, 08 Dec 2022 05:05:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670504702; cv=none; d=google.com; s=arc-20160816; b=ANHmNzWgAiBjrF+OWEwQQa2bRsJ6YY7eR4ihlbKtkQFW9Kx4sGtc+qfZpzQQZaHot+ 6WQDXe+7762DUNwr7IwBnBpfecCwbZCmkBjVZPvlXpvtH2K6y/yOXaZaXFEXuTMq/sWt ykBSL0314WW2PQEa+x1zSl4Fg2/GUSZ6jxOsQsGuR8yQjbx0uthrxq3PemrE4bpG2Z7J Gbik8z6w/tivsNw1A424gcHXgiGgEJNu2EFeU4qiqwXwVW4IgpqhD7909iB9FkNT3JP2 wf55dfkR/dQmzlpB+lmwiN0erTv8gWCG5cwH/EEAaGty8XBsT8l6R3CQYeIhKtgNUGn2 5T7Q== 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=sdcNqjIs8SR7wEjYi6T9meYiGl6VoCbM8vsPoPbVtmg=; b=IgLnnmoPsZVJtSlD5GSDHcvjpw/fqBtFtlHNe3mU4NUQw/TiOtH/KOwAyCp3Gh1B5D 7ldaPrglnr2aJNzAxQTKuf+BumDAoaHyWyUp2sOlzANQFWja2gfVyOz8BLQpcWTEFni5 ZEqGgAU3lklqk/8GwEvNjoCqQXjUqb/IGAwVClro0NJo9Cy+VVrDgaQjWQ2Fpxt83Xdy NBQzpubux0wN1p+b0r5Pd5RZLMMcUBSihHzsPz0hCNaGA8dwOQzb5AR7YbMQ2jlz1OqY Vx3vP8UJ248eohoZw9+BLJupoJ0TgSJni+jxQ1X7Q4tYAtme3Ft+t1w579oyqwfM0Gln FGIw== 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x84-20020a633157000000b00463fc72dae9si24298987pgx.144.2022.12.08.05.04.51; Thu, 08 Dec 2022 05:05:02 -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 S229797AbiLHLr5 (ORCPT + 72 others); Thu, 8 Dec 2022 06:47:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229470AbiLHLry (ORCPT ); Thu, 8 Dec 2022 06:47:54 -0500 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81DA710FC7; Thu, 8 Dec 2022 03:47:50 -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 4NSXTJ712Jz8RTZG; Thu, 8 Dec 2022 19:47:48 +0800 (CST) Received: from szxlzmapp01.zte.com.cn ([10.5.231.85]) by mse-fl2.zte.com.cn with SMTP id 2B8BlcKc017346; Thu, 8 Dec 2022 19:47:38 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp04[null]) by mapi (Zmail) with MAPI id mid14; Thu, 8 Dec 2022 19:47:41 +0800 (CST) Date: Thu, 8 Dec 2022 19:47:41 +0800 (CST) X-Zmail-TransId: 2b066391ceddffffffffae9289c2 X-Mailer: Zmail v1.0 Message-ID: <202212081947418573438@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , , , , , , Subject: =?UTF-8?B?W1BBVENIIGxpbnV4LW5leHRdIGV0aHRvb2w6IHVzZSBzdHJzY3B5KCkgdG8gaW5zdGVhZCBvZiBzdHJuY3B5KCk=?= Content-Type: text/plain; charset="UTF-8" X-MAIL: mse-fl2.zte.com.cn 2B8BlcKc017346 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.137.novalocal with ID 6391CEE4.000 by FangMail milter! X-FangMail-Envelope: 1670500069/4NSXTJ712Jz8RTZG/6391CEE4.000/10.5.228.133/[10.5.228.133]/mse-fl2.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 6391CEE4.000/4NSXTJ712Jz8RTZG X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, 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 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 --- drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c index 54faf0f2d1d8..b54f3706fb97 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c @@ -644,18 +644,15 @@ static void hns_nic_get_drvinfo(struct net_device *net_dev, { struct hns_nic_priv *priv = netdev_priv(net_dev); - strncpy(drvinfo->version, HNAE_DRIVER_VERSION, + strscpy(drvinfo->version, HNAE_DRIVER_VERSION, sizeof(drvinfo->version)); - drvinfo->version[sizeof(drvinfo->version) - 1] = '\0'; - strncpy(drvinfo->driver, HNAE_DRIVER_NAME, sizeof(drvinfo->driver)); - drvinfo->driver[sizeof(drvinfo->driver) - 1] = '\0'; + strscpy(drvinfo->driver, HNAE_DRIVER_NAME, sizeof(drvinfo->driver)); - strncpy(drvinfo->bus_info, priv->dev->bus->name, + strscpy(drvinfo->bus_info, priv->dev->bus->name, sizeof(drvinfo->bus_info)); - drvinfo->bus_info[ETHTOOL_BUSINFO_LEN - 1] = '\0'; - strncpy(drvinfo->fw_version, "N/A", ETHTOOL_FWVERS_LEN); + strscpy(drvinfo->fw_version, "N/A", ETHTOOL_FWVERS_LEN); drvinfo->eedump_len = 0; } -- 2.15.2