[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <202212261840048448622@zte.com.cn>
Date: Mon, 26 Dec 2022 18:40:04 +0800 (CST)
From: <yang.yang29@....com.cn>
To: <james.bottomley@...senpartnership.com>
Cc: <deller@....de>, <linux-parisc@...r.kernel.org>,
<linux-kernel@...r.kernel.org>, <xu.panda@....com.cn>,
<yang.yang29@....com.cn>
Subject: [PATCH linux-next v2] parisc: use strscpy() to instead of strncpy()
From: Xu Panda <xu.panda@....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@....com.cn>
Signed-off-by: Yang Yang <yang.yang29@....com>
---
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;
--
2.15.2
Powered by blists - more mailing lists