From patchwork Fri Dec 23 02:57:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 36101 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp106423wrn; Thu, 22 Dec 2022 18:59:19 -0800 (PST) X-Google-Smtp-Source: AMrXdXtDlmpemZlG/f6MGHhjhKvD5YTLG5VxU99YU+ABOyhoGA9oayY9IZ4htjG0yHjsDkJZ3fA9 X-Received: by 2002:a17:903:12d7:b0:189:854a:fff3 with SMTP id io23-20020a17090312d700b00189854afff3mr7757746plb.23.1671764359511; Thu, 22 Dec 2022 18:59:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671764359; cv=none; d=google.com; s=arc-20160816; b=q9e9YPfWHB2SjNr1b5TYFFZ27v/JA5rO1erfH5So3KOukQOYZ/iAoiblAQ43N3qOzq APPRWyuWaxVLGoRVkHRG9YzSTmHShlXJGwMMAa7Wtxf40Qx/IMi72PseOzH0ce8Tv3yO sseW+6ZWZS40rhVJv0ukVECRIoKWyqDPcpz+kZoYcKWi0tP3tQOE1W//1/gsiobPi1IZ K0pzqH7YfXOMD47bZKXpaMTDCFvoQY1VIyQ4AUMwFlITnWwU4K9jviv/pmaJ3YNX4fZL PJ20bpw7Zi45BlLeXbrV2mIR8jpTAaYak/0h0l7YvDLWNxS5QYoaXnWTLhuYejRGJ0P5 6eAw== 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=3pUK9EYWrZ+oyjD3sI0SRlTntvhoEYemz9AOtupA+74=; b=0GpMrjAKlX96BIdLWpf/K2eML0yKVG8zjNK6MMjycDwC9elZxOsCMcbPWtPQsgc8ci S0Qce+qbNCv+wAaKQB8EYDmYjAM4SBiCAe+RD7pNB4ZuaCBTdJFGI5pukrcypjd0mDIN pnmjjoyPj29ec9zei+PZ9BZZda5vzvBIp9i8f2b05GOpgS/XV4thbOxNdkv5tC7ObSV4 nEk1BPfjQMLvrVYHs2PuGyzi8kxo8RuMDlwT7fL9oZwzBAUFVFAhNM4TZ/FLjaqhZDQm fBZObn92RsBtm/3ZQOmlNF58hbtqXG1lyTRCmwwUZVsk+GVSf2Oo7vnh5lFgEbcC7vlF ggbw== 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 s5-20020a632c05000000b0046af0960898si2537190pgs.625.2022.12.22.18.59.06; Thu, 22 Dec 2022 18:59:19 -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 S230384AbiLWC6B (ORCPT + 99 others); Thu, 22 Dec 2022 21:58:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235866AbiLWC5w (ORCPT ); Thu, 22 Dec 2022 21:57:52 -0500 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C86F29360; Thu, 22 Dec 2022 18:57:51 -0800 (PST) Received: from mse-fl1.zte.com.cn (unknown [10.5.228.132]) (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 4NdX0s5DY6z6FK2P; Fri, 23 Dec 2022 10:57:49 +0800 (CST) Received: from szxlzmapp03.zte.com.cn ([10.5.231.207]) by mse-fl1.zte.com.cn with SMTP id 2BN2vdKr082489; Fri, 23 Dec 2022 10:57:39 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp02[null]) by mapi (Zmail) with MAPI id mid14; Fri, 23 Dec 2022 10:57:40 +0800 (CST) Date: Fri, 23 Dec 2022 10:57:40 +0800 (CST) X-Zmail-TransId: 2b0463a519242f9b73c8 X-Mailer: Zmail v1.0 Message-ID: <202212231057406402834@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , , , , Subject: =?utf-8?q?=5BPATCH_net-next=5D_wl18xx=3A_use_strscpy=28=29_to_inste?= =?utf-8?q?ad_of_strncpy=28=29?= X-MAIL: mse-fl1.zte.com.cn 2BN2vdKr082489 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.138.novalocal with ID 63A5192D.001 by FangMail milter! X-FangMail-Envelope: 1671764269/4NdX0s5DY6z6FK2P/63A5192D.001/10.5.228.132/[10.5.228.132]/mse-fl1.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 63A5192D.001/4NdX0s5DY6z6FK2P 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?1752971985029545299?= X-GMAIL-MSGID: =?utf-8?q?1752971985029545299?= 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/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;