OSDN Git Service

sparc64: Fix buggy strlcpy() conversion in ldom_reboot().
authorDavid S. Miller <davem@davemloft.net>
Fri, 27 Sep 2013 20:46:04 +0000 (13:46 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 13 Oct 2013 23:08:32 +0000 (16:08 -0700)
commit34b6bdb2a889231e450774b5227a80c2f5051bc0
tree0e7286d9aad132c6b9a3b946280875d153d948de
parent32f0ba8e21166ec3ac11d692852d6d3e768942a4
sparc64: Fix buggy strlcpy() conversion in ldom_reboot().

[ Upstream commit 2bd161a605f1f84a5fc8a4fe8410113a94f79355 ]

Commit 117a0c5fc9c2d06045bd217385b2b39ea426b5a6 ("sparc: kernel: using
strlcpy() instead of strcpy()") added a bug to ldom_reboot in
arch/sparc/kernel/ds.c

- strcpy(full_boot_str + strlen("boot "), boot_command);
+      strlcpy(full_boot_str + strlen("boot "), boot_command,
+            sizeof(full_boot_str + strlen("boot ")));

That last sizeof() expression evaluates to sizeof(size_t) which is
not what was intended.

Also even the corrected:

     sizeof(full_boot_str) + strlen("boot ")

is not right as the destination buffer length is just plain
"sizeof(full_boot_str)" and that's what the final argument
should be.

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/sparc/kernel/ds.c