Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b936842 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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().
parents 517bf8fc 2bd161a6

arch/sparc/kernel/ds.c

+1 −1
Original line number Diff line number Diff line
@@ -851,7 +851,7 @@ void ldom_reboot(const char *boot_command) 


		strcpy(full_boot_str, "boot ");

		strlcpy(full_boot_str + strlen("boot "), boot_command,

			sizeof(full_boot_str + strlen("boot ")));

			sizeof(full_boot_str));

		len = strlen(full_boot_str);



		if (reboot_data_supported) {