LoongArch: kexec: Fix address space mismatch in command line lookup
PATCH 1/1 LoongArch: kexec: Fix address space mismatch in command line lookup
From: George Guo <[email protected]>
When searching the loaded segments for the "kexec" command line marker, the kexec_load(2) path (file_mode == 0) passes the user-space segment buffer straight to strncmp() through a bogus (char __user *) cast. This dereferences a user pointer in kernel context, which is wrong and is flagged by sparse:
arch/loongarch/kernel/machine_kexec.c:84:51: sparse: incorrect type in argument 2 (different address spaces) @@ expected char const * @@ got char [noderef] __user *
Copy the marker-sized prefix of each segment into a small on-stack buffer with copy_from_user() before comparing, and skip segments that fault. The subsequent copy_from_user() that stages the full command line into the safe area is left unchanged.
--- arch/loongarch/kernel/machine_kexec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/loongarch/kernel/machine_kexec.c +6 -2
@@ -42,7 +42,7 @@ static unsigned long first_ind_entry;int machine_kexec_prepare (struct kimage *kimage) {int i; -char *bootloader ="kexec" ; +static const char bootloader[] ="kexec" ;void *cmdline_ptr = (void *)KEXEC_CMDLINE_ADDR ; kimage->arch.efi_boot = fw_arg0;
@@ -57,9 +57,13 @@ int machine_kexec_prepare(struct kimage *kimage) strlen((char *)kimage->arch.cmdline_ptr) + 1); kimage->arch.cmdline_ptr = (unsigned long )KEXEC_CMDLINE_ADDR ; }else { +char tmp[sizeof (bootloader)]; +/* Find the command line */ for (i =0 ; i < kimage->nr_segments; i++) { -if (!strncmp (bootloader, (char __user *)kimage->segment[i].buf,strlen (bootloader))) { +if (copy_from_user (tmp, kimage->segment[i].buf,strlen (bootloader))) +continue ; +if (!strncmp (bootloader, tmp,strlen (bootloader))) {if (!copy_from_user (cmdline_ptr, kimage->segment[i].buf,COMMAND_LINE_SIZE )) kimage->arch.cmdline_ptr = (unsigned long )cmdline_ptr;break ;
Signature · 1 line
2.25.1
Huacai Chen
maintainerHi, George,
Quoted 42 lines · George Guo
From: George Guo <[email protected]>
When searching the loaded segments for the "kexec" command line marker, the
kexec_load(2)path (file_mode== 0) passes the user-space segment buffer straight tostrncmp()through a bogus (char__user*) cast. This dereferences a user pointer in kernel context, which is wrong and is flagged by sparse:
arch/loongarch/kernel/machine_kexec.c:84:51: sparse: incorrect type in argument 2 (different address spaces) @@ expected char const * @@ got char [noderef]__user*Copy the marker-sized prefix of each segment into a small on-stack buffer with
copy_from_user()before comparing, and skip segments that fault. The subsequentcopy_from_user()that stages the full command line into the safe area is left unchanged.Fixes 4a03b2ac06a5 ("LoongArch: Add kexec support")Reported-by kernel test robot <[email protected]>Co-developed-by Kexin Liu <[email protected]>Signed-off-by Kexin Liu <[email protected]>Signed-off-by George Guo <[email protected]>--- arch/loongarch/kernel/machine_kexec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)arch/loongarch/kernel/machine_kexec.c +1
-1@@ -42,7 +42,7 @@ static unsigned long first_ind_entry;int machine_kexec_prepare (struct kimage *kimage) {int i; -char *bootloader ="kexec" ; +static const char bootloader[] ="kexec" ;void *cmdline_ptr = (void *)KEXEC_CMDLINE_ADDR ; kimage->arch.efi_boot = fw_arg0;
arch/loongarch/kernel/machine_kexec.c int machine_kexec_prepare(struct kimage *kimage) · line 60
Quoted 4 lines
arch/loongarch/kernel/machine_kexec.c +1
-0@@ -57,9 +57,13 @@ int machine_kexec_prepare(struct kimage *kimage) strlen((char *)kimage->arch.cmdline_ptr) + 1); kimage->arch.cmdline_ptr = (unsigned long )KEXEC_CMDLINE_ADDR ; }else { +char tmp[sizeof (bootloader)];
Just define it as "head[8]" near bootloader, and bootloader is unnecessary to modify.
Huacai
Quoted 14 lines
arch/loongarch/kernel/machine_kexec.c +4
-2+/* Find the command line */ for (i =0 ; i < kimage->nr_segments; i++) { -if (!strncmp (bootloader, (char __user *)kimage->segment[i].buf,strlen (bootloader))) { +if (copy_from_user (tmp, kimage->segment[i].buf,strlen (bootloader))) +continue ; +if (!strncmp (bootloader, tmp,strlen (bootloader))) {if (!copy_from_user (cmdline_ptr, kimage->segment[i].buf,COMMAND_LINE_SIZE )) kimage->arch.cmdline_ptr = (unsigned long )cmdline_ptr;break ; --2.25.1