From patchwork Mon Dec 5 11:38:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 29660 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2208521wrr; Mon, 5 Dec 2022 04:07:42 -0800 (PST) X-Google-Smtp-Source: AA0mqf7PSKLWUpu2Rq5ic615FZ/rB+9yYszRCPGVi+/uAKv4iLueVb2zKm02RsRbBwD4Io+mB1Bf X-Received: by 2002:a17:906:6d7:b0:781:951:2fb with SMTP id v23-20020a17090606d700b00781095102fbmr69780757ejb.64.1670242062673; Mon, 05 Dec 2022 04:07:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670242062; cv=none; d=google.com; s=arc-20160816; b=l4P5bUDEQYcC9IhFG05QAibuDQ3pHKuqnlwz7CBgyf3n43Z2niJNLx2i/DakXxpt/J KYws2EsLwguTtEeUPDTIDRgeTbS+EP93xwRoR5Njhe288qNiKy4VkeDJvFV9UnISwKRx sjg8huOodbV5ISwDB2HbCWogcuMV3pvMkHZcA7HJiVGfTAIOu3bNhfS2fcQmiPOg1wRk 5I5QNkimaHdcfjAPh3d9vFgfibqRZAbB017JW5kgIHdRXfSYjKtPEDvISPyK9AhnXpzE gWh0zmhtyWewNbcxvSCVd1n8pYsPw9EqKgC7OPibTwiKZfU3btjhvix9A8NlsxknQ2Fq mlqA== 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=dY4G+OEJjaW8DNATpJYL13lbvz2Po4I+gGx8UGgRvzY=; b=ognheT6/5qEHUGt2ksuE1/jSojSh9UWapL3HeI/h6ygF38dh/JZb+t8p8AiSLdNRAf 6eFtcp0hyLBviVB5dcmMr5V7xGo9kxtGpEi1IAnphZF5LxzvFUJAggqhPujkthp+VGVj YLy602fRRWpCu5n4/wCMY/IEK5S85cFcR3nAbxwaeMSVGc4itdHtnJmR1wD0xa+nTvit bs+MIELrHRxfCc2FsMkuQfWBbIYpBomdfWpVB/Yj3w3LqzzQutiU68JdS4ySeF9stuj4 3sxnbgUpBQ72pw1/JxvGRm96FR8W/SF2llKVHF0CTnYLbYsrXA66JeLlE+xQymuvP61o I4Ew== 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 sb9-20020a1709076d8900b007879bb73291si12172051ejc.807.2022.12.05.04.07.18; Mon, 05 Dec 2022 04:07:42 -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 S229917AbiLELih (ORCPT + 99 others); Mon, 5 Dec 2022 06:38:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231430AbiLELiN (ORCPT ); Mon, 5 Dec 2022 06:38:13 -0500 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 514521A07E for ; Mon, 5 Dec 2022 03:38:05 -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 4NQhPS0bFsz8RSdJ; Mon, 5 Dec 2022 19:38:04 +0800 (CST) Received: from szxlzmapp03.zte.com.cn ([10.5.231.207]) by mse-fl2.zte.com.cn with SMTP id 2B5Bbxpw076280; Mon, 5 Dec 2022 19:37:59 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp02[null]) by mapi (Zmail) with MAPI id mid14; Mon, 5 Dec 2022 19:38:02 +0800 (CST) Date: Mon, 5 Dec 2022 19:38:02 +0800 (CST) X-Zmail-TransId: 2b04638dd81affffffffbefa11df X-Mailer: Zmail v1.0 Message-ID: <202212051938026789359@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , Subject: =?utf-8?q?=5BPATCH_linux-next=5D_virtio=5Fconsole=3A_use_strscpy_to?= =?utf-8?q?_instead_of_strncpy=28=29?= X-MAIL: mse-fl2.zte.com.cn 2B5Bbxpw076280 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.137.novalocal with ID 638DD81C.000 by FangMail milter! X-FangMail-Envelope: 1670240284/4NQhPS0bFsz8RSdJ/638DD81C.000/10.5.228.133/[10.5.228.133]/mse-fl2.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 638DD81C.000/4NQhPS0bFsz8RSdJ 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?1751375741002208576?= X-GMAIL-MSGID: =?utf-8?q?1751375741002208576?= 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/char/virtio_console.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index 6a821118d553..d5ac4d955bc8 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -1666,9 +1666,8 @@ static void handle_control_message(struct virtio_device *vdev, "Not enough space to store port name\n"); break; } - strncpy(port->name, buf->buf + buf->offset + sizeof(*cpkt), - name_size - 1); - port->name[name_size - 1] = 0; + strscpy(port->name, buf->buf + buf->offset + sizeof(*cpkt), + name_size); /* * Since we only have one sysfs attribute, 'name',