Skip to contentSkip to conversation

mm/damon/sysfs-schemes: use strscpy() to instead of strncpy()

PATCH Applied [email protected] 2 participants 2 messages Jan 9, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mm/damon/sysfs-schemes: use strscpy() to instead of strncpy()

From: Xu Panda <[email protected]>

The implementation of strscpy() is more robust and safer. That's now the recommended way to copy NUL-terminated strings.

---
 mm/damon/sysfs-schemes.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
mm/damon/sysfs-schemes.c +1 -2
index f0dabe3e2dc0..86edca66aab1 100644
@@ -353,8 +353,7 @@ static ssize_t memcg_path_store(struct kobject *kobj,
 	if (!path)
 		return -ENOMEM;
 
-	strncpy(path, buf, count);
-	path[count] = '\0';
+	strscpy(path, buf, count + 1);
 	filter->memcg_path = path;
 	return count;
 }
Signature · 1 line
2.15.2
maintainer Reviewed-by on v1 1/1
#1 lore raw

Hello Xu,

Thank you for this patch.

Quoted 7 lines · On Mon, 9 Jan 2023 19:46:55 +0800 (CST) <[email protected]> wrote:

From: Xu Panda <[email protected]>

The implementation of strscpy() is more robust and safer. That's now the recommended way to copy NUL-terminated strings.

Thanks,
SJ

Quoted 20 lines
---
 mm/damon/sysfs-schemes.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
mm/damon/sysfs-schemes.c +1 -2
index f0dabe3e2dc0..86edca66aab1 100644
@@ -353,8 +353,7 @@ static ssize_t memcg_path_store(struct kobject *kobj,
 	if (!path)
 		return -ENOMEM;
 
-	strncpy(path, buf, count);
-	path[count] = '\0';
+	strscpy(path, buf, count + 1);
 	filter->memcg_path = path;
 	return count;
 }
Signature · 1 line
2.15.2