diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-01 15:57:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-01 15:57:59 -0400 |
| commit | 0b936842c86392dad2c880539e824881e5d8ba77 (patch) | |
| tree | 95dbb304e8c0e83a0dc733b087f9b9eb8b7d21d4 | |
| parent | 517bf8fc211d37d3aa005fb35f9ee7f1d35cb860 (diff) | |
| parent | 2bd161a605f1f84a5fc8a4fe8410113a94f79355 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fix from David Miller:
"Just a single bug fix to a regression added during some strlcpy()
conversions"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Fix buggy strlcpy() conversion in ldom_reboot().
| -rw-r--r-- | arch/sparc/kernel/ds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c index 62d6b153ffa2..4d9ac8406f32 100644 --- a/arch/sparc/kernel/ds.c +++ b/arch/sparc/kernel/ds.c | |||
| @@ -851,7 +851,7 @@ void ldom_reboot(const char *boot_command) | |||
| 851 | 851 | ||
| 852 | strcpy(full_boot_str, "boot "); | 852 | strcpy(full_boot_str, "boot "); |
| 853 | strlcpy(full_boot_str + strlen("boot "), boot_command, | 853 | strlcpy(full_boot_str + strlen("boot "), boot_command, |
| 854 | sizeof(full_boot_str + strlen("boot "))); | 854 | sizeof(full_boot_str)); |
| 855 | len = strlen(full_boot_str); | 855 | len = strlen(full_boot_str); |
| 856 | 856 | ||
| 857 | if (reboot_data_supported) { | 857 | if (reboot_data_supported) { |