[PATCH next] drivers/mtd/devices/phram: Replace strnlen() strcpy() pair with strscpy()

[PATCH next] drivers/mtd/devices/phram: Replace strnlen() strcpy() pair with strscpy()

[david.laight.linux]

From: David Laight <david.laight.linux@gmail.com>

Use the result of strscpy() for the overflow check.

Signed-off-by: David Laight <david.laight.linux@gmail.com>
---
This is one of a group of patches that remove potentially unbounded
strcpy() calls.

They are mostly replaced by strscpy() or, when strlen() has just been
called, with memcpy() (usually including the '\0').

Calls with copy string literals into arrays are left unchanged.
They are safe and easily detected as such.

The changes were made by getting the compiler to detect the calls and
then fixing the code by hand.

Note that all the changes are only compile tested.

Some Makefiles were changed to allow files to contain strcpy().
As well as 'difficult to fix' files, this included 'show' functions
as they really need to use sysfs_emit() or seq_printf().

All the patches are being sent individually to avoid very long cc lists.
Apologies for the terse commit messages and likely unexpected tags.
(There are about 100 patches in total.)

 drivers/mtd/devices/phram.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
index b42cadcd76b1..7025d9bf5929 100644
--- a/drivers/mtd/devices/phram.c
+++ b/drivers/mtd/devices/phram.c
@@ -268,10 +268,8 @@ static int phram_setup(const char *val)
 	uint32_t rem;
 	int i, ret;
 
-	if (strnlen(val, sizeof(buf)) >= sizeof(buf))
+	if (strscpy(buf, val) < 0)
 		parse_err("parameter too long\n");
-
-	strcpy(str, val);
 	kill_final_newline(str);
 
 	for (i = 0; i < 4; i++)
-- 
2.39.5


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

[PATCH next] drivers/mtd/devices/phram: Replace strnlen() strcpy() pair with strscpy()

[david.laight.linux]

From: David Laight <david.laight.linux@gmail.com>

Use the result of strscpy() for the overflow check.

Signed-off-by: David Laight <david.laight.linux@gmail.com>
---
This is one of a group of patches that remove potentially unbounded
strcpy() calls.

They are mostly replaced by strscpy() or, when strlen() has just been
called, with memcpy() (usually including the '\0').

Calls with copy string literals into arrays are left unchanged.
They are safe and easily detected as such.

The changes were made by getting the compiler to detect the calls and
then fixing the code by hand.

Note that all the changes are only compile tested.

Some Makefiles were changed to allow files to contain strcpy().
As well as 'difficult to fix' files, this included 'show' functions
as they really need to use sysfs_emit() or seq_printf().

All the patches are being sent individually to avoid very long cc lists.
Apologies for the terse commit messages and likely unexpected tags.
(There are about 100 patches in total.)

 drivers/mtd/devices/phram.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
index b42cadcd76b1..7025d9bf5929 100644
--- a/drivers/mtd/devices/phram.c
+++ b/drivers/mtd/devices/phram.c
@@ -268,10 +268,8 @@ static int phram_setup(const char *val)
 	uint32_t rem;
 	int i, ret;
 
-	if (strnlen(val, sizeof(buf)) >= sizeof(buf))
+	if (strscpy(buf, val) < 0)
 		parse_err("parameter too long\n");
-
-	strcpy(str, val);
 	kill_final_newline(str);
 
 	for (i = 0; i < 4; i++)
-- 
2.39.5