]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
alpha: replace sprintf()/strcpy() with scnprintf()/strscpy()
authorThorsten Blum <thorsten.blum@linux.dev>
Wed, 21 May 2025 12:18:38 +0000 (14:18 +0200)
committerAndrew Morton <akpm@linux-foundation.org>
Thu, 10 Jul 2025 05:57:49 +0000 (22:57 -0700)
Replace sprintf() with the safer variant scnprintf() and use its return
value instead of calculating the string length again using strlen().

Use strscpy() instead of the deprecated strcpy().

No functional changes intended.

Link: https://github.com/KSPP/linux/issues/88
Link: https://lkml.kernel.org/r/20250521121840.5653-1-thorsten.blum@linux.dev
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: guoweikang <guoweikang.kernel@gmail.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
arch/alpha/kernel/core_marvel.c

index b1bfbd11980d94177dee9116f468825349ecbf9d..d38f4d6759e465111c506cd9d37603c9b77e811b 100644 (file)
@@ -17,6 +17,7 @@
 #include <linux/vmalloc.h>
 #include <linux/mc146818rtc.h>
 #include <linux/rtc.h>
+#include <linux/string.h>
 #include <linux/module.h>
 #include <linux/memblock.h>
 
@@ -79,10 +80,12 @@ mk_resource_name(int pe, int port, char *str)
 {
        char tmp[80];
        char *name;
-       
-       sprintf(tmp, "PCI %s PE %d PORT %d", str, pe, port);
-       name = memblock_alloc_or_panic(strlen(tmp) + 1, SMP_CACHE_BYTES);
-       strcpy(name, tmp);
+       size_t sz;
+
+       sz = scnprintf(tmp, sizeof(tmp), "PCI %s PE %d PORT %d", str, pe, port);
+       sz += 1; /* NUL terminator */
+       name = memblock_alloc_or_panic(sz, SMP_CACHE_BYTES);
+       strscpy(name, tmp, sz);
 
        return name;
 }