These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / x86 / kernel / kexec-bzimage64.c

diff --git a/kernel/arch/x86/kernel/kexec-bzimage64.c b/kernel/arch/x86/kernel/kexec-bzimage64.c
index ca05f86..0f8a6bb 100644 (file)
--- a/kernel/arch/x86/kernel/kexec-bzimage64.c
+++ b/kernel/arch/x86/kernel/kexec-bzimage64.c
@@ -72,15 +72,16 @@ static int setup_cmdline(struct kimage *image, struct boot_params *params,
                         unsigned long cmdline_len)
 {
        char *cmdline_ptr = ((char *)params) + cmdline_offset;
-       unsigned long cmdline_ptr_phys, len;
+       unsigned long cmdline_ptr_phys, len = 0;
        uint32_t cmdline_low_32, cmdline_ext_32;
 
-       memcpy(cmdline_ptr, cmdline, cmdline_len);
        if (image->type == KEXEC_TYPE_CRASH) {
-               len = sprintf(cmdline_ptr + cmdline_len - 1,
-                       " elfcorehdr=0x%lx", image->arch.elf_load_addr);
-               cmdline_len += len;
+               len = sprintf(cmdline_ptr,
+                       "elfcorehdr=0x%lx ", image->arch.elf_load_addr);
        }
+       memcpy(cmdline_ptr + len, cmdline, cmdline_len);
+       cmdline_len += len;
+
        cmdline_ptr[cmdline_len - 1] = '\0';
 
        pr_debug("Final command line is: %s\n", cmdline_ptr);
@@ -222,9 +223,6 @@ setup_boot_parameters(struct kimage *image, struct boot_params *params,
        memset(&params->hd0_info, 0, sizeof(params->hd0_info));
        memset(&params->hd1_info, 0, sizeof(params->hd1_info));
 
-       /* Default sysdesc table */
-       params->sys_desc_table.length = 0;
-
        if (image->type == KEXEC_TYPE_CRASH) {
                ret = crash_setup_memmap_entries(image, params);
                if (ret)
@@ -535,7 +533,9 @@ static int bzImage64_verify_sig(const char *kernel, unsigned long kernel_len)
        int ret;
 
        ret = verify_pefile_signature(kernel, kernel_len,
-                                     system_trusted_keyring, &trusted);
+                                     system_trusted_keyring,
+                                     VERIFYING_KEXEC_PE_SIGNATURE,
+                                     &trusted);
        if (ret < 0)
                return ret;
        if (!trusted)