| Message ID | 202212051936400309332@zte.com.cn |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2196792wrr;
Mon, 5 Dec 2022 03:42:42 -0800 (PST)
X-Google-Smtp-Source:
AA0mqf4Wb3YXyPC1X3iqYn+r8yMWDX3/Eo8O/xhBI+hBKtGxi6MUq7EXsRAngMmgzoQuulz0GASc
X-Received: by 2002:aa7:946a:0:b0:576:abe0:8b95 with SMTP id
t10-20020aa7946a000000b00576abe08b95mr9097018pfq.34.1670240562508;
Mon, 05 Dec 2022 03:42:42 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1670240562; cv=none;
d=google.com; s=arc-20160816;
b=tfjiqVSDR40m3hFw6nfghn/PNKSoJvcyg81FYD8u5mcFFVjwIJjIVH23nRIqT6qnXT
JSmdS2RHw2u++Oa65+O9OhzuIwSGjk/XczWKsDTAriBbYlpeIN0yhR2PHmBW9fiH1c3C
4r0ZgGL9UNTQlad2dv+C1AHbvVrIw/CQR2wfBPIrBOJXNPVlO/R+lsiEnzyOS4KUh64S
8D3qbA33wL7hfXyXrS+ybbg8c+yks8GpNJMmwwdkzFdNh98b/6JlOPyvEsK/GglJNFCc
Q+vwXMRSDtH8mew4BgiKwrj4Fym6yurw4IEknoCCQS5o+y+aSzQGoj9I/YFyr/DLAXvy
tKDw==
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=8dFgwBsb+ifD3pil3VCawClQZBj9cS0sp8KDUJ4nCDE=;
b=QIKXdIcK+/J/Ja6zY8+Jm9IO89AXyq8jA7hFXiUTSbPBy4fEL3PReXbPgjHpS1yhnQ
pIh2nkTpX5K2pWUjjQ3WHIL8eB9tUS6TShirdxsh3uP8bXFO2BJGTeeCSkArCRRu/ff8
yic3F029vHBu/EcYia/UpA2FpBwJyU+TzYm0dD1M2AZa6K9kRfpcK+/3aHQZeNfkpXs0
F97SUU+BGCQBGN6y/918+zVHPY5rNQRhRTWgQCWZxb8coL2QlvuyBrn6vfRiEAtRp0BZ
3WGOzOx1ldzT6X7wwFJolQjcF0b8W5wxV//E22l5KI1ZudeEHq2cKsAOkjpdSYCPg3bu
S4iA==
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
z6-20020a656646000000b004780ea3db18si14505645pgv.133.2022.12.05.03.42.28;
Mon, 05 Dec 2022 03:42: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 S231222AbiLELgr (ORCPT <rfc822;jaysivo@gmail.com> + 99 others);
Mon, 5 Dec 2022 06:36:47 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49880 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229970AbiLELgp (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Mon, 5 Dec 2022 06:36:45 -0500
Received: from mxct.zte.com.cn (mxct.zte.com.cn [183.62.165.209])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2891A19299
for <linux-kernel@vger.kernel.org>;
Mon, 5 Dec 2022 03:36:45 -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 mxct.zte.com.cn (FangMail) with ESMTPS id 4NQhMv42LCz4xpy7;
Mon, 5 Dec 2022 19:36:43 +0800 (CST)
Received: from szxlzmapp03.zte.com.cn ([10.5.231.207])
by mse-fl1.zte.com.cn with SMTP id 2B5BaaYY051373;
Mon, 5 Dec 2022 19:36:36 +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:36:40 +0800 (CST)
Date: Mon, 5 Dec 2022 19:36:40 +0800 (CST)
X-Zmail-TransId: 2b04638dd7c8ffffffffa569f048
X-Mailer: Zmail v1.0
Message-ID: <202212051936400309332@zte.com.cn>
Mime-Version: 1.0
From: <yang.yang29@zte.com.cn>
To: <minyard@acm.org>
Cc: <openipmi-developer@lists.sourceforge.net>,
<linux-kernel@vger.kernel.org>, <xu.panda@zte.com.cn>,
<yang.yang29@zte.com.cn>
Subject: =?utf-8?q?=5BPATCH_linux-next=5D_ipmi/watchdog=3A_use_strscpy=28=29?=
=?utf-8?q?_to_instead_of_strncpy=28=29?=
Content-Type: text/plain;
charset="UTF-8"
X-MAIL: mse-fl1.zte.com.cn 2B5BaaYY051373
X-Fangmail-Gw-Spam-Type: 0
X-FangMail-Miltered: at cgslv5.04-192.168.251.13.novalocal with ID
638DD7CB.000 by FangMail milter!
X-FangMail-Envelope:
1670240203/4NQhMv42LCz4xpy7/638DD7CB.000/10.5.228.132/[10.5.228.132]/mse-fl1.zte.com.cn/<yang.yang29@zte.com.cn>
X-Fangmail-Anti-Spam-Filtered: true
X-Fangmail-MID-QID: 638DD7CB.000/4NQhMv42LCz4xpy7
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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1751374167796976900?=
X-GMAIL-MSGID: =?utf-8?q?1751374167796976900?=
|
| Series |
[linux-next] ipmi/watchdog: use strscpy() to instead of strncpy()
|
|
Commit Message
Yang Yang
Dec. 5, 2022, 11:36 a.m. UTC
Xu Panda <xu.panda@zte.com.cn> 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 <xu.panda@zte.com.cn> Signed-off-by: Yang Yang <yang.yang29@zte.com> --- drivers/char/ipmi/ipmi_watchdog.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Comments
On Mon, Dec 05, 2022 at 07:36:40PM +0800, yang.yang29@zte.com.cn wrote: > Xu Panda <xu.panda@zte.com.cn> > > The implementation of strscpy() is more robust and safer. > That's now the recommended way to copy NUL terminated strings. This looks right. Applied, thanks. -corey > > Signed-off-by: Xu Panda <xu.panda@zte.com.cn> > Signed-off-by: Yang Yang <yang.yang29@zte.com> > --- > drivers/char/ipmi/ipmi_watchdog.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c > index 47365150e431..0d4a8dcacfd4 100644 > --- a/drivers/char/ipmi/ipmi_watchdog.c > +++ b/drivers/char/ipmi/ipmi_watchdog.c > @@ -213,8 +213,7 @@ static int set_param_str(const char *val, const struct kernel_param *kp) > char valcp[16]; > char *s; > > - strncpy(valcp, val, 15); > - valcp[15] = '\0'; > + strscpy(valcp, val, 16); > > s = strstrip(valcp); > > -- > 2.15.2
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c index 47365150e431..0d4a8dcacfd4 100644 --- a/drivers/char/ipmi/ipmi_watchdog.c +++ b/drivers/char/ipmi/ipmi_watchdog.c @@ -213,8 +213,7 @@ static int set_param_str(const char *val, const struct kernel_param *kp) char valcp[16]; char *s; - strncpy(valcp, val, 15); - valcp[15] = '\0'; + strscpy(valcp, val, 16); s = strstrip(valcp);