qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scsi: target: Replace deprecated strncpy() with strscpy() 

JIRA: https://issues.redhat.com/browse/RHEL-93481

strncpy() is deprecated for NUL-terminated destination buffers; use
strscpy() instead. The destination buffer db_root is only used with "%s"
format strings and must therefore be NUL-terminated, but not NUL-padded.

Use scnprintf() because snprintf() could return a value >= DB_ROOT_LEN
and lead to an out-of-bounds access. This doesn't happen because count
is explicitly checked against DB_ROOT_LEN before. However, scnprintf()
always returns the number of characters actually written to the string
buffer, which is always within the bounds of db_root_stage, and should
be preferred over snprintf().

The size parameter of strscpy() is optional and since DB_ROOT_LEN is the
size of the destination buffer, it can be removed. Remove it to simplify
the code.

Compile-tested only.

Link: https://github.com/KSPP/linux/issues/90
Link: https://github.com/KSPP/linux/issues/105
Cc: linux-hardening@vger.kernel.org
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Link: https://lore.kernel.org/r/20250302225641.245127-2-thorsten.blum@linux.dev
Reviewed-by: Kees Cook <kees@kernel.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit dfb7df1ddb29c89662e84b2c82c1ff7943358ae0)
Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
This commit is contained in:
Maurizio Lombardi 2025-05-26 11:15:01 +02:00
parent eaf4637d0b
commit 66807f66dd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/target/target_core_configfs.c
View File

@ -123,7 +123,7 @@ static ssize_t target_core_item_dbroot_store(struct config_item *item,
goto unlock; goto unlock;
} }
read_bytes = snprintf(db_root_stage, DB_ROOT_LEN, "%s", page); read_bytes = scnprintf(db_root_stage, DB_ROOT_LEN, "%s", page);
if (!read_bytes) if (!read_bytes)
goto unlock; goto unlock;
@ -143,7 +143,7 @@ static ssize_t target_core_item_dbroot_store(struct config_item *item,
} }
filp_close(fp, NULL); filp_close(fp, NULL);
strncpy(db_root, db_root_stage, read_bytes); strscpy(db_root, db_root_stage);
pr_debug("Target_Core_ConfigFS: db_root set to %s\n", db_root); pr_debug("Target_Core_ConfigFS: db_root set to %s\n", db_root);
r = read_bytes; r = read_bytes;
@ -3664,7 +3664,7 @@ static void target_init_dbroot(void)
} }
filp_close(fp, NULL); filp_close(fp, NULL);
strncpy(db_root, db_root_stage, DB_ROOT_LEN); strscpy(db_root, db_root_stage);
pr_debug("Target_Core_ConfigFS: db_root set to %s\n", db_root); pr_debug("Target_Core_ConfigFS: db_root set to %s\n", db_root);
} }