From patchwork Mon Dec 26 10:40:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 36587 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp846733wrt; Mon, 26 Dec 2022 02:46:38 -0800 (PST) X-Google-Smtp-Source: AMrXdXsn3gh825nU2yU5+QZTh+UaC7wlTdfdoC7ZYKmwkRjpW9L6/LTnIqWruiW/QJ0pFJYx3Cun X-Received: by 2002:aa7:96aa:0:b0:581:3b0e:803c with SMTP id g10-20020aa796aa000000b005813b0e803cmr1814222pfk.7.1672051597821; Mon, 26 Dec 2022 02:46:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672051597; cv=none; d=google.com; s=arc-20160816; b=p+/FJdkVzCaomT2jAOIDibyxmdC/RZE/nFsRQXQadWRvIBy0TyOcqnpPzQaTmKvqJE sv0xUw0sdwxWodzXkRh0bhF/yQpSQ545Lae4kE1sgug+YrohBvDHmepO4KwmRGcy9i+k efS9TpMkHahGvpQv17/T/q6edtoA+F3PlC0MqQItAZrp3lrr3x/Gky7aFiVvC5/TU0Yx SbKhbj50D0Csxo8j7ohVBMX9MR5ZeiYcv5sFVoM/TyOPYPTWEpdiZsoz6SlB51PHkH2d MPx8HLL9Ny793fQFTEQidCbODAN0X5a5OjX3WKWArioOZv6g6UfYDzhTwv4y8GPHLCib Y8jQ== 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=Vmd03RGiocuaCDfdnS1HmBsjNeFBkgVJLj8yqkMZn9Y=; b=ssOZ2+K6MGAWAj87OSp8uuPqN1MbOXbDpyJ94QAW+ZBBo4+jMNzBo+CoU3QIx1Smgl GCw27Qc97Qf+D0flvo3ObRfMNxOaLre/7eksPxs4BC9Xf8/f7Buk8DslbzJQYkBx3GN+ 7Tmqjbz0zzmfR3+8wyKRFMhSZJ0otznfp2A3zYKt81m57wtusfLu3fU8tlIqcWUYERuG 0zMsq4iKO8OU9b+5Mn9ld8NFi53G7N8OoTd7brDCS+lLOQssiDLC9lQ5TUAhgIMmXYbt mncaBd3HdbiEIau/n5Tqkb9ZJZq5ee+hUL6ZXWik7TWliKoQARJ6UTlNzUgKf8MWBzEd DsJA== 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 j8-20020aa78dc8000000b00574ceca0a75si10732199pfr.311.2022.12.26.02.46.23; Mon, 26 Dec 2022 02:46:37 -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 S229999AbiLZKkM (ORCPT + 99 others); Mon, 26 Dec 2022 05:40:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229484AbiLZKkK (ORCPT ); Mon, 26 Dec 2022 05:40:10 -0500 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA6EC10DF; Mon, 26 Dec 2022 02:40:07 -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 4NgZ6s5zfdz4xVnH; Mon, 26 Dec 2022 18:40:05 +0800 (CST) Received: from szxlzmapp01.zte.com.cn ([10.5.231.85]) by mse-fl1.zte.com.cn with SMTP id 2BQAe1xc048557; Mon, 26 Dec 2022 18:40:01 +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 18:40:04 +0800 (CST) Date: Mon, 26 Dec 2022 18:40:04 +0800 (CST) X-Zmail-TransId: 2b0363a97a04fffffffff67e1b98 X-Mailer: Zmail v1.0 Message-ID: <202212261840048448622@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , Subject: =?utf-8?q?=5BPATCH_linux-next_v2=5D_parisc=3A_use_strscpy=28=29_to_?= =?utf-8?q?instead_of_strncpy=28=29?= X-MAIL: mse-fl1.zte.com.cn 2BQAe1xc048557 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.138.novalocal with ID 63A97A05.000 by FangMail milter! X-FangMail-Envelope: 1672051205/4NgZ6s5zfdz4xVnH/63A97A05.000/10.5.228.132/[10.5.228.132]/mse-fl1.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 63A97A05.000/4NgZ6s5zfdz4xVnH 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?1753273175778686035?= X-GMAIL-MSGID: =?utf-8?q?1753273175778686035?= 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 --- change for v2 - sizeof(in) is better and simplified, thanks for Helge Deller. --- drivers/parisc/pdc_stable.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c index d6af5726ddf3..d3075445260b 100644 --- a/drivers/parisc/pdc_stable.c +++ b/drivers/parisc/pdc_stable.c @@ -274,8 +274,7 @@ pdcspath_hwpath_write(struct pdcspath_entry *entry, const char *buf, size_t coun /* We'll use a local copy of buf */ count = min_t(size_t, count, sizeof(in)-1); - strncpy(in, buf, count); - in[count] = '\0'; + strscpy(in, buf, sizeof(in)); /* Let's clean up the target. 0xff is a blank pattern */ memset(&hwpath, 0xff, sizeof(hwpath)); @@ -388,8 +387,7 @@ pdcspath_layer_write(struct pdcspath_entry *entry, const char *buf, size_t count /* We'll use a local copy of buf */ count = min_t(size_t, count, sizeof(in)-1); - strncpy(in, buf, count); - in[count] = '\0'; + strscpy(in, buf, sizeof(in)); /* Let's clean up the target. 0 is a blank pattern */ memset(&layers, 0, sizeof(layers)); @@ -756,8 +754,7 @@ static ssize_t pdcs_auto_write(struct kobject *kobj, /* We'll use a local copy of buf */ count = min_t(size_t, count, sizeof(in)-1); - strncpy(in, buf, count); - in[count] = '\0'; + strscpy(in, buf, sizeof(in)); /* Current flags are stored in primary boot path entry */ pathentry = &pdcspath_entry_primary;