scsi: target: Replace deprecated strncpy() with strscpy()
Subsystems (2)
PATCH 1/1 scsi: target: Replace deprecated strncpy() with strscpy()
Since strncpy() is deprecated for NUL-terminated destination buffers, use strscpy() instead.
Compile-tested only.
--- drivers/target/target_core_configfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/target/target_core_configfs.c +1 -1
@@ -143,7 +143,7 @@ static ssize_t target_core_item_dbroot_store(struct config_item *item, }filp_close (fp,NULL ); -strncpy (db_root, db_root_stage, read_bytes); +strscpy (db_root, db_root_stage, read_bytes);pr_debug ("Target_Core_ConfigFS: db_root set to %s\n" , db_root); r = read_bytes;
Signature · 1 line
2.48.1
Quoted 17 lines · Thorsten Blum
Since
strncpy()is deprecated for NUL-terminated destination buffers, usestrscpy()instead.Compile-tested only.
Signed-off-by Thorsten Blum <[email protected]>--- drivers/target/target_core_configfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/target/target_core_configfs.c +0
-0
drivers/target/target_core_configfs.c static ssize_t target_core_item_dbroot_store(struct config_item *item, · line 149
Quoted 8 lines
drivers/target/target_core_configfs.c +1
-1@@ -143,7 +143,7 @@ static ssize_t target_core_item_dbroot_store(struct config_item *item, }filp_close (fp,NULL ); -strncpy (db_root, db_root_stage, read_bytes); +strscpy (db_root, db_root_stage, read_bytes);pr_debug ("Target_Core_ConfigFS: db_root set to %s\n" , db_root); r = read_bytes;
When doing strncpy() to strscpy() conversions, please include details of your analysis for several things:
- why is it safe to be NUL-terminated?
- why is NUL padding needed/not needed?
- why is the maximum length argument correct?
In this case, db_root is used with "%s" format strings, so we know it is expected to be NUL-terminated. Additionally, it is _only_ ever used with "5s" format strings, so padding is not needed.
As for length, read_bytes will always be less than DB_ROOT_LEN because it is explicitly tested for against "count" which, enforced by the SETATTR API, will always be the number of valid bytes in "page", and snprintf() will be limited to DB_ROOT_LEN. (snprintf may return more than its length argument, but because of the "count" check, this should be impossible.)
While you're in this file, though, can you replace the other strncpy that is used in target_init_dbroot() also?
-Kees
Signature · 1 line
Kees Cook
Quoted 11 lines · Kees Cook
Quoted 9 lines · Thorsten Blum
Since
strncpy()is deprecated for NUL-terminated destination buffers, usestrscpy()instead.Compile-tested only.
Signed-off-by Thorsten Blum <[email protected]>---
Quoted 6 lines
When doing
strncpy()tostrscpy()conversions, please include details of your analysis for several things:- why is it safe to be NUL-terminated?
- why is NUL padding needed/not needed?
- why is the maximum length argument correct?
Yes, I'll try to describe it better.
Quoted 2 lines
While you're in this file, though, can you replace the other strncpy that is used in
target_init_dbroot()also?
Ah, I missed this one and will submit a v2 soon.
Thanks,
Thorsten