]> www.infradead.org Git - users/hch/misc.git/commitdiff
net/rds: Replace deprecated strncpy() with strscpy_pad()
authorThorsten Blum <thorsten.blum@linux.dev>
Wed, 19 Feb 2025 22:47:31 +0000 (23:47 +0100)
committerJakub Kicinski <kuba@kernel.org>
Fri, 21 Feb 2025 23:51:26 +0000 (15:51 -0800)
strncpy() is deprecated for NUL-terminated destination buffers. Use
strscpy_pad() instead and remove the manual NUL-termination.

Compile-tested only.

Link: https://github.com/KSPP/linux/issues/90
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Reviewed-by: Kees Cook <kees@kernel.org>
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
Tested-by: Allison Henderson <allison.henderson@oracle.com>
Link: https://patch.msgid.link/20250219224730.73093-2-thorsten.blum@linux.dev
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/rds/stats.c

index 9e87da43c0045211e8be52ee37d6bfe52f589e9a..cb2e3d2cdf73836b204e0afc2c9cf832cfb98543 100644 (file)
@@ -89,8 +89,7 @@ void rds_stats_info_copy(struct rds_info_iterator *iter,
 
        for (i = 0; i < nr; i++) {
                BUG_ON(strlen(names[i]) >= sizeof(ctr.name));
-               strncpy(ctr.name, names[i], sizeof(ctr.name) - 1);
-               ctr.name[sizeof(ctr.name) - 1] = '\0';
+               strscpy_pad(ctr.name, names[i]);
                ctr.value = values[i];
 
                rds_info_copy(iter, &ctr, sizeof(ctr));