From: <yang.yang29@zte.com.cn>
To: <steve.wahl@hpe.com>
Cc: <mike.travis@hpe.com>, <dimitri.sivanich@hpe.com>,
<russ.anderson@hpe.com>, <dvhart@infradead.org>,
<andy@infradead.org>, <tglx@linutronix.de>, <mingo@redhat.com>,
<bp@alien8.de>, <dave.hansen@linux.intel.com>, <x86@kernel.org>,
<hpa@zytor.com>, <platform-driver-x86@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <xu.panda@zte.com.cn>,
<yang.yang29@zte.com.cn>, <andy.shevchenko@gmail.com>
Subject: [PATCH linux-next v2] x86/platform/uv: use strscpy to instead of strncpy()
Date: Mon, 5 Dec 2022 19:42:08 +0800 (CST) [thread overview]
Message-ID: <202212051942082259437@zte.com.cn> (raw)
From: 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.
---
change for v2
- fix the mistake and make the code better and simpler,
thanks to Andy Shevchenko.
---
Signed-off-by: Xu Panda <xu.panda@zte.com.cn>
Signed-off-by: Yang Yang <yang.yang29@zte.com>
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
arch/x86/platform/uv/uv_nmi.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/arch/x86/platform/uv/uv_nmi.c b/arch/x86/platform/uv/uv_nmi.c
index a60af0230e27..d94140842aa3 100644
--- a/arch/x86/platform/uv/uv_nmi.c
+++ b/arch/x86/platform/uv/uv_nmi.c
@@ -205,11 +205,7 @@ static int param_set_action(const char *val, const struct kernel_param *kp)
char arg[ACTION_LEN], *p;
/* (remove possible '\n') */
- strncpy(arg, val, ACTION_LEN - 1);
- arg[ACTION_LEN - 1] = '\0';
- p = strchr(arg, '\n');
- if (p)
- *p = '\0';
+ strscpy(arg, val, strnchrnul(val, ACTION_LEN, '\n') - val);
for (i = 0; i < n; i++)
if (!strcmp(arg, valid_acts[i].action))
--
2.15.2
next reply other threads:[~2022-12-05 11:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-05 11:42 yang.yang29 [this message]
2022-12-05 13:13 ` [PATCH linux-next v2] x86/platform/uv: use strscpy to instead of strncpy() Andy Shevchenko
2022-12-05 13:15 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=202212051942082259437@zte.com.cn \
--to=yang.yang29@zte.com.cn \
--cc=andy.shevchenko@gmail.com \
--cc=andy@infradead.org \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=dimitri.sivanich@hpe.com \
--cc=dvhart@infradead.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mike.travis@hpe.com \
--cc=mingo@redhat.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=russ.anderson@hpe.com \
--cc=steve.wahl@hpe.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=xu.panda@zte.com.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.