From patchwork Mon Dec 26 11:14:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 36594 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp858656wrt; Mon, 26 Dec 2022 03:20:34 -0800 (PST) X-Google-Smtp-Source: AMrXdXulQGtRBqdz0wpDpZNXL/lMjhmDzPTIH6GHseA0+qmjAdtT20HaZcKG/OgVPWZN55+hn7CS X-Received: by 2002:a17:902:e3d5:b0:192:6a20:3cb1 with SMTP id r21-20020a170902e3d500b001926a203cb1mr6594043ple.51.1672053633789; Mon, 26 Dec 2022 03:20:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672053633; cv=none; d=google.com; s=arc-20160816; b=F7dHqGKgnyQ17TH7M7tNlYMho1ShO3D+80cduKfuaXRGkZIdNVezNDOcRf7N1g4RVC ahSJH3lWDQEi+KKxji+YqyT7hFwnCDM5YgH4a51UIQ0x7o9kJbyr9Kjp2KNHH2jonnZT l04jOD7yzoy0htX2wyPMd3PtHqMKHCTd9MEc16xKmkEq77PfgxS/S4f3BLV44KFYzGUv AEr50hzMEmbrxUXVdRG1f++EzMZiIZfmRFVIpSBhoCNXYJf6zfu7SYB6ULApE3pA0wI0 Rxx4QC3h0WZ1Vr8W/AEUq5mb1qLsQJyFeH5eJs1kaJH8euP9avpJKJRR4uBiOzsNV9VF Hehg== 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=BVji5t/UoMGiq58vvCND3VuCzXO486lmm/TaYdXf9nA=; b=gPB/SDrMs8FLbLYvoeBUyDVZm22gz0L3kwzj2C2FK7NAOsTEiZ543QGOhDYmVsvzsO 9kovuSmv5N1XUX5ovozfP5PGtLlR/8YJFTcMy01bMJgPx+fWsAXp+LnnN/gl6VPGcqet q1xoEfxJFR82C6mHBS/a4qXEGPOIxqlOcA36IRSGmpVPMPLX1bTnB6d1fQ+MP8tVBWTv fA29gzeKXE8Xr1NQv65xo1WFkfHVXO7zaPPgv4s9g7oOg4SMOCxlDoVL9+bRv6OKBfOy jti3VkeQgomXMy4KJSe2qX+rq4+CL2/x9ykHGVD6CwyOUUEmTiKP0YvQYOQ2PXY2HiSF kIpQ== 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 c4-20020a170902f30400b00188729593c0si9803421ple.47.2022.12.26.03.20.21; Mon, 26 Dec 2022 03:20:33 -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 S231997AbiLZLOU (ORCPT + 99 others); Mon, 26 Dec 2022 06:14:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229960AbiLZLOS (ORCPT ); Mon, 26 Dec 2022 06:14:18 -0500 Received: from mxct.zte.com.cn (mxct.zte.com.cn [183.62.165.209]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 556342DC1; Mon, 26 Dec 2022 03:14:17 -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 mxct.zte.com.cn (FangMail) with ESMTPS id 4NgZtH4XSkz4xpyB; Mon, 26 Dec 2022 19:14:15 +0800 (CST) Received: from szxlzmapp04.zte.com.cn ([10.5.231.166]) by mse-fl2.zte.com.cn with SMTP id 2BQBE3HI073008; Mon, 26 Dec 2022 19:14:03 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp01[null]) by mapi (Zmail) with MAPI id mid14; Mon, 26 Dec 2022 19:14:06 +0800 (CST) Date: Mon, 26 Dec 2022 19:14:06 +0800 (CST) X-Zmail-TransId: 2b0363a981fe61526202 X-Mailer: Zmail v1.0 Message-ID: <202212261914060599112@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , , , , , Subject: =?utf-8?q?=5BPATCH_wireless-next_v2=5D_wl18xx=3A_use_strscpy=28=29_?= =?utf-8?q?to_instead_of_strncpy=28=29?= X-MAIL: mse-fl2.zte.com.cn 2BQBE3HI073008 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.251.13.novalocal with ID 63A98207.001 by FangMail milter! X-FangMail-Envelope: 1672053255/4NgZtH4XSkz4xpyB/63A98207.001/10.5.228.133/[10.5.228.133]/mse-fl2.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 63A98207.001/4NgZtH4XSkz4xpyB 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?1753275311184319117?= X-GMAIL-MSGID: =?utf-8?q?1753275311184319117?= 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: Simon Horman --- change for v2 - use the right tag of wireless-next. --- drivers/net/wireless/ti/wl18xx/main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c index 0b3cf8477c6c..1e4a430d1543 100644 --- a/drivers/net/wireless/ti/wl18xx/main.c +++ b/drivers/net/wireless/ti/wl18xx/main.c @@ -1516,12 +1516,9 @@ static int wl18xx_handle_static_data(struct wl1271 *wl, struct wl18xx_static_data_priv *static_data_priv = (struct wl18xx_static_data_priv *) static_data->priv; - strncpy(wl->chip.phy_fw_ver_str, static_data_priv->phy_version, + strscpy(wl->chip.phy_fw_ver_str, static_data_priv->phy_version, sizeof(wl->chip.phy_fw_ver_str)); - /* make sure the string is NULL-terminated */ - wl->chip.phy_fw_ver_str[sizeof(wl->chip.phy_fw_ver_str) - 1] = '\0'; - wl1271_info("PHY firmware version: %s", static_data_priv->phy_version); return 0;