From patchwork Mon Dec 26 11:05:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 36591 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp856817wrt; Mon, 26 Dec 2022 03:15:21 -0800 (PST) X-Google-Smtp-Source: AMrXdXvOGtE1s1OYdPzAtMLthgfxmwv+xx2oPZBPOFvqCpc8arqw52KGI7zbmH1xrZcCqW8IoNqp X-Received: by 2002:a05:6402:4150:b0:47e:1b4a:5491 with SMTP id x16-20020a056402415000b0047e1b4a5491mr15985933eda.20.1672053320863; Mon, 26 Dec 2022 03:15:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672053320; cv=none; d=google.com; s=arc-20160816; b=JWdyRF+lFWOhpPWUoo1tbWwOf6/XugyqbC37FGkmSHBSgA4ffBlQ9lBiP3CTiTRcgj 8b8ocbVE/CKKu2BwBNiudkagIry7y+JRa5dsfsykWoYbz8n7Gapn+hRyTKW1+o92jgDH Klu5CRH3WmzjWUuwSOgW68JOt8jIKafUmAoYMFSXNLCk3pJpHr8+4XqnobzdSlJ2p9H+ NAiv8ELm+RnC1ED9EuOeBN6OEGmTJkHx0g1GSDsNM2bklcFj1KhNPW5l6ZkL5qzOJDzf hSr9d9NTmI+m3G6AZba/U1HLtLIGJlksmU6BJhiiQ8XZ+VatI4e78lG0Ov4tEUmA4eT6 6yLw== 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=vf79+YOHmrBX7si1yp0CCh1JDKa4CYOk1g9c06mAbdI=; b=HsQrERKNuqDS57XhWqH+VS60gpWym56j6ZmDd/BU8QKhfNLiKjTg6mty9eS36KtMXh Ab6z8/u6n/ggBA54l6o7Jk/hSpoo/mQa3hMHNmOEOsfV4eXoqurHdC52JO9AbynjWJN4 OIk0AAK4RDjB7wIc5xR245CVApBrZtokmeGriEOda6q3nVLk862frUtX/mBjn8UFIc+W OpuQlALXPJZBVW94hH5UqrSqoa+uPb/ZcffQD3FUsPdTLr5JabmZUgGdIbUzXutRbFt9 TfSLp0OZ42Cehhg05W1kGwP9KaQv0qcO4KhWIBB2Rff2lV3qwQ5B9vVuSW5IIzdk7y6F EkNQ== 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 eb5-20020a0564020d0500b0046cb20e358asi9884479edb.362.2022.12.26.03.14.54; Mon, 26 Dec 2022 03:15:20 -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 S231785AbiLZLGB (ORCPT + 99 others); Mon, 26 Dec 2022 06:06:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231593AbiLZLGA (ORCPT ); Mon, 26 Dec 2022 06:06:00 -0500 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2ABD6B57 for ; Mon, 26 Dec 2022 03:05:59 -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 4NgZhj61nyz8R03d; Mon, 26 Dec 2022 19:05:57 +0800 (CST) Received: from szxlzmapp03.zte.com.cn ([10.5.231.207]) by mse-fl1.zte.com.cn with SMTP id 2BQB5ip4062779; Mon, 26 Dec 2022 19:05:44 +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:05:47 +0800 (CST) Date: Mon, 26 Dec 2022 19:05:47 +0800 (CST) X-Zmail-TransId: 2b0363a9800bffffffffb9415792 X-Mailer: Zmail v1.0 Message-ID: <202212261905476729002@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , , , , , , , Subject: =?utf-8?q?=5BPATCH_linux-next=5D_staging=3A_r8188eu=3A_use_strscpy?= =?utf-8?q?=28=29_to_instead_of_strncpy=28=29?= X-MAIL: mse-fl1.zte.com.cn 2BQB5ip4062779 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.137.novalocal with ID 63A98015.001 by FangMail milter! X-FangMail-Envelope: 1672052757/4NgZhj61nyz8R03d/63A98015.001/10.5.228.132/[10.5.228.132]/mse-fl1.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 63A98015.001/4NgZhj61nyz8R03d 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?1753274982973293280?= X-GMAIL-MSGID: =?utf-8?q?1753274982973293280?= 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: Dan Carpenter --- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging/r8188eu/os_dep/ioctl_linux.c index 8e9b7b0664bc..e0a819970546 100644 --- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c +++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c @@ -3061,8 +3061,7 @@ static int rtw_rereg_nd_name(struct net_device *dev, char *reg_ifname; reg_ifname = padapter->registrypriv.if2name; - strncpy(rereg_priv->old_ifname, reg_ifname, IFNAMSIZ); - rereg_priv->old_ifname[IFNAMSIZ - 1] = 0; + strscpy(rereg_priv->old_ifname, reg_ifname, IFNAMSIZ); } if (wrqu->data.length > IFNAMSIZ) @@ -3084,8 +3083,7 @@ static int rtw_rereg_nd_name(struct net_device *dev, rtw_ips_mode_req(&padapter->pwrctrlpriv, rereg_priv->old_ips_mode); } - strncpy(rereg_priv->old_ifname, new_ifname, IFNAMSIZ); - rereg_priv->old_ifname[IFNAMSIZ - 1] = 0; + strscpy(rereg_priv->old_ifname, new_ifname, IFNAMSIZ); if (!memcmp(new_ifname, "disable%d", 9)) { /* free network queue for Android's timming issue */