s390/boot: Replace strncpy() with strscpy()

Replace the last 2 usages of strncpy() in s390 code with strscpy().

Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/boot/ipl_parm.c b/arch/s390/boot/ipl_parm.c
index d04e9b89d14a669713a6603f9a497a6d09763b56..16b6809e628aa430ed5919b3b1b0edec82af9a6d 100644 (file)
--- a/arch/s390/boot/ipl_parm.c
+++ b/arch/s390/boot/ipl_parm.c
@@ -309,7 +309,7 @@ void parse_boot_command_line(void)
                if (!strcmp(param, "bootdebug")) {
                        bootdebug = true;
                        if (val)
-                               strncpy(bootdebug_filter, val, sizeof(bootdebug_filter) - 1);
+                               strscpy(bootdebug_filter, val);
                }
                if (!strcmp(param, "quiet"))
                        boot_console_loglevel = CONSOLE_LOGLEVEL_QUIET;

diff --git a/arch/s390/boot/printk.c b/arch/s390/boot/printk.c
index 8cf6331bc060839fcd272dc9ac198c3cdea94329..8f3b2244ef1b66ee65e219363aaba03e482aeb5b 100644 (file)
--- a/arch/s390/boot/printk.c
+++ b/arch/s390/boot/printk.c
@@ -158,7 +158,7 @@ static noinline char *strsym(char *buf, void *ip)
 
        p = findsym((unsigned long)ip, &off, &len);
        if (p) {
-               strncpy(buf, p, MAX_SYMLEN);
+               strscpy(buf, p, MAX_SYMLEN);
                /* reserve 15 bytes for offset/len in symbol+0x1234/0x1234 */
                p = buf + strnlen(buf, MAX_SYMLEN - 15);
                strcpy(p, "+0x");