lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sparc: fix ldom_reboot buffer overflow harder

Browse Source 
The length argument to strlcpy was still wrong. It could overflow the end of
full_boot_str by 5 bytes. Instead of strcat and strlcpy, just use snprint.

Reported-by: Brad Spengler <spender@grsecurity.net>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Kees Cook
2013-10-01 22:13:34 -07:00
committed by David S. Miller
parent c31eeaced2
commit 20928bd3f0
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/sparc/kernel/ds.c
View File

@@ -849,9 +849,8 @@ void ldom_reboot(const char *boot_command)
if (boot_command && strlen(boot_command)) { if (boot_command && strlen(boot_command)) {
unsigned long len; unsigned long len;
strcpy(full_boot_str, "boot "); snprintf(full_boot_str, sizeof(full_boot_str), "boot %s",
strlcpy(full_boot_str + strlen("boot "), boot_command, boot_command);
sizeof(full_boot_str));
len = strlen(full_boot_str); len = strlen(full_boot_str);
if (reboot_data_supported) { if (reboot_data_supported) {