From patchwork Fri Dec 23 02:54:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 36094 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp105701wrn; Thu, 22 Dec 2022 18:56:31 -0800 (PST) X-Google-Smtp-Source: AMrXdXvGf+pfhkM+U+03Qe7mlrppJ7pe9XbtnDS02K4CUpyOJL1dxS0czGa6GnhMBXUKZwPlJff+ X-Received: by 2002:a05:6a20:42a0:b0:a5:6e3d:1055 with SMTP id o32-20020a056a2042a000b000a56e3d1055mr12953395pzj.16.1671764191094; Thu, 22 Dec 2022 18:56:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671764191; cv=none; d=google.com; s=arc-20160816; b=BvkIKScjHVZ/MyrXPbwOzTbIFZyo0aGGEoT/AXrDpS0ep4yVZ+m4usG3J1ucCoAoz3 f8EA3bDKANSgEZPle8tmr47XaX1vNq6ZcYhqj3nE3WzDXmLjitzghJn4+d910zgFbn8T LNUdM7PX7trV4kcJDXD/Q5CJ/j5e0R30Pt1iPQQzbbnx6cv49oFBY0dfmt3UzQe7QhhO jBIiaqytrNtPXza93B7HUpm9XZtXAx0Od050PLvFXJGEFqoOnUjjF7Wcfe4esRBfaDvF xFbmrOZSByHnvsJMIlWku8E8IXB0L74MI+Bxc2PCI+AGFlAqo77mOVPfGkW5DXMzr177 t8+Q== 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=rjfGAUPFVXSBlIBql1y5Im8vf9ag7sPpQjgUpr/f20U=; b=YIfn4xQ5UmxjaiNjYWz0mrK2A/N0DvBvXa6TPkB3sB4z1P2ZilpEuSEDzEPPLqHhsR uJckUNyVKA7vOdPoHq6ZPTXtcj7sOI6g37jAjRYZmaPmjhoByvnGymYaghNO3/4Sbufu ZyN2IGtZqXiI0zNU+Cp67Y9axhxteGepqJ50fbA3CmoACB7Fp2DPyoX3QirSNsSsXfLx cuDKT9+fROfk0nqWs2kDG/QUQCspMkK1Q7gFbpp+STxapaDvdwtzf8VQ09tBfAjzgk3N at/qLfc7pszyhuOtHMFrCKD2TY4jZn87he3+sjXyqOUB/SfwH5ti2M307zmNFu5Bveib qAJg== 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 u22-20020a056a00125600b0056cb8f6f027si2497402pfi.357.2022.12.22.18.56.19; Thu, 22 Dec 2022 18:56:31 -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 S235788AbiLWCzF (ORCPT + 99 others); Thu, 22 Dec 2022 21:55:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229675AbiLWCzC (ORCPT ); Thu, 22 Dec 2022 21:55:02 -0500 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 300812127D; Thu, 22 Dec 2022 18:55:01 -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 4NdWxb5sYmz8QrkZ; Fri, 23 Dec 2022 10:54:59 +0800 (CST) Received: from szxlzmapp03.zte.com.cn ([10.5.231.207]) by mse-fl1.zte.com.cn with SMTP id 2BN2ssGA080385; Fri, 23 Dec 2022 10:54:54 +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:54:55 +0800 (CST) Date: Fri, 23 Dec 2022 10:54:55 +0800 (CST) X-Zmail-TransId: 2b0463a5187f776b084c X-Mailer: Zmail v1.0 Message-ID: <202212231054555312754@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , , , , , , Subject: =?utf-8?q?=5BPATCH_net-next=5D_wifi=3A_atmel=3A_use_strscpy=28=29_t?= =?utf-8?q?o_instead_of_strncpy=28=29?= X-MAIL: mse-fl1.zte.com.cn 2BN2ssGA080385 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.137.novalocal with ID 63A51883.000 by FangMail milter! X-FangMail-Envelope: 1671764099/4NdWxb5sYmz8QrkZ/63A51883.000/10.5.228.132/[10.5.228.132]/mse-fl1.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 63A51883.000/4NdWxb5sYmz8QrkZ 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752971808225797001?= X-GMAIL-MSGID: =?utf-8?q?1752971808225797001?= 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/atmel/atmel.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireless/atmel/atmel.c b/drivers/net/wireless/atmel/atmel.c index 7c2d1c588156..dda4027c6a31 100644 --- a/drivers/net/wireless/atmel/atmel.c +++ b/drivers/net/wireless/atmel/atmel.c @@ -2651,8 +2651,7 @@ static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) priv->firmware = new_firmware; priv->firmware_length = com.len; - strncpy(priv->firmware_id, com.id, 31); - priv->firmware_id[31] = '\0'; + strscpy(priv->firmware_id, com.id, 32); break; case ATMELRD: