From patchwork Wed Dec 7 01:09:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 30570 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3146245wrr; Tue, 6 Dec 2022 17:19:03 -0800 (PST) X-Google-Smtp-Source: AA0mqf5Doqcb1h0T53ROel/1uYMhk9TPyOPTRa5oRrpNneMJ068vTPWEyslneMK2463UzEnoyCc1 X-Received: by 2002:a17:902:9a01:b0:186:94b8:5982 with SMTP id v1-20020a1709029a0100b0018694b85982mr74212642plp.102.1670375943077; Tue, 06 Dec 2022 17:19:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670375943; cv=none; d=google.com; s=arc-20160816; b=rwpre8QSWYYLWyoztT9P7cpc6JMBtqtDamk/dosAV6z94BfVN5i/Q9ST6JqiynIHlR AUt1Q0uKdiK/SC8o32WrzMtBGdCXZ/Okifw0XIXafKLPg40rHKv5XkYtoQzbtgXu1QJQ AImPPf7dgm0K8xRuYc3jPD/GaPgTh8xEwZF5DmXoRRY78+W3V0vHZ4DcVXneoTD5TISK KrHYUb30DCF1X02EVf358l5tghv2Ksn2Xso8soktcpQq/VYCRla1FsipzlI0B/cjLJAK dhnzkFg6wXEHWWAfK/rXiY5RKlAYSELRuyyqAvvjL2f71bMiVtz6cVEhg1g4jSygvT5d YjPg== 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=jutZhDeYx1LUTZriJaEd89G8/YNZyWx0rytJ1ocDRbE=; b=EaiLnAYguDRo3nl2ubvO9LieUD/+91kgxLvtVLdOhXgYSstgsTJv5GRn5mqsbpLUyc YAR8v5aLi7W2CK7V8tEIaLpPcPa1jJPbjqI324qzlGxrUxLpkHFeqBDguFlE6prY146P 0VGz43nggBtYkCtfWtGcjNlrxTRd2QwNw6iIcm9St+hAHHf6HIPSVC6CKOQgnriybyPF jDhS+GEWKd2N4UwSfl8IQyLrEfKUoFNFFdGlGnPQu3FrKhEzlD7tGikapmrRag5oIxQ+ Dp5akjti/eMSusD8+NA4zutmxjnSIQiI4UeqDfiboBXF2UyK+SrgqC77t9frNkDa5NPv 8u1Q== 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 x84-20020a633157000000b00463fc72dae9si19748358pgx.144.2022.12.06.17.18.49; Tue, 06 Dec 2022 17:19:03 -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 S229758AbiLGBJq (ORCPT + 99 others); Tue, 6 Dec 2022 20:09:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229737AbiLGBJe (ORCPT ); Tue, 6 Dec 2022 20:09:34 -0500 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BEABB60E7; Tue, 6 Dec 2022 17:09:32 -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 4NRfMH0SZrz8RV7G; Wed, 7 Dec 2022 09:09:31 +0800 (CST) Received: from szxlzmapp05.zte.com.cn ([10.5.230.85]) by mse-fl2.zte.com.cn with SMTP id 2B71984p063121; Wed, 7 Dec 2022 09:09:08 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp02[null]) by mapi (Zmail) with MAPI id mid14; Wed, 7 Dec 2022 09:09:09 +0800 (CST) Date: Wed, 7 Dec 2022 09:09:09 +0800 (CST) X-Zmail-TransId: 2b04638fe7b575b72e87 X-Mailer: Zmail v1.0 Message-ID: <202212070909095189693@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , , , , , , , , , , , , Subject: =?utf-8?q?=5BPATCH_linux-next=5D_can=3A_ucan=3A_use_strscpy=28=29_t?= =?utf-8?q?o_instead_of_strncpy=28=29?= X-MAIL: mse-fl2.zte.com.cn 2B71984p063121 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.137.novalocal with ID 638FE7CB.000 by FangMail milter! X-FangMail-Envelope: 1670375371/4NRfMH0SZrz8RV7G/638FE7CB.000/10.5.228.133/[10.5.228.133]/mse-fl2.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 638FE7CB.000/4NRfMH0SZrz8RV7G 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?1751516124925637008?= X-GMAIL-MSGID: =?utf-8?q?1751516124925637008?= 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/can/usb/ucan.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/can/usb/ucan.c b/drivers/net/can/usb/ucan.c index ffa38f533c35..159e25ffa337 100644 --- a/drivers/net/can/usb/ucan.c +++ b/drivers/net/can/usb/ucan.c @@ -1534,9 +1534,8 @@ static int ucan_probe(struct usb_interface *intf, sizeof(union ucan_ctl_payload)); if (ret > 0) { /* copy string while ensuring zero termination */ - strncpy(firmware_str, up->ctl_msg_buffer->raw, - sizeof(union ucan_ctl_payload)); - firmware_str[sizeof(union ucan_ctl_payload)] = '\0'; + strscpy(firmware_str, up->ctl_msg_buffer->raw, + sizeof(union ucan_ctl_payload) + 1); } else { strcpy(firmware_str, "unknown"); }