Commit afc18069 authored by Kairui Song's avatar Kairui Song Committed by Ingo Molnar

x86/kexec: Use up-to-dated screen_info copy to fill boot params

kexec_file_load() currently reuses the old boot_params.screen_info,
but if drivers have change the hardware state, boot_param.screen_info
could contain invalid info.

For example, the video type might be no longer VGA, or the frame buffer
address might be changed. If the kexec kernel keeps using the old screen_info,
kexec'ed kernel may attempt to write to an invalid framebuffer
memory region.

There are two screen_info instances globally available, boot_params.screen_info
and screen_info. Later one is a copy, and is updated by drivers.

So let kexec_file_load use the updated copy.

[ mingo: Tidied up the changelog. ]
Signed-off-by: default avatarKairui Song <kasong@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20201014092429.1415040-2-kasong@redhat.com
parent 081dd68c
...@@ -200,8 +200,7 @@ setup_boot_parameters(struct kimage *image, struct boot_params *params, ...@@ -200,8 +200,7 @@ setup_boot_parameters(struct kimage *image, struct boot_params *params,
params->hdr.hardware_subarch = boot_params.hdr.hardware_subarch; params->hdr.hardware_subarch = boot_params.hdr.hardware_subarch;
/* Copying screen_info will do? */ /* Copying screen_info will do? */
memcpy(&params->screen_info, &boot_params.screen_info, memcpy(&params->screen_info, &screen_info, sizeof(struct screen_info));
sizeof(struct screen_info));
/* Fill in memsize later */ /* Fill in memsize later */
params->screen_info.ext_mem_k = 0; params->screen_info.ext_mem_k = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment