Ping? Can someone pull this into x86 tip? Thanks! -Kees On Sun, Feb 1, 2015 at 11:32 PM, Baoquan He <bhe at redhat.com> wrote: > > Hi Thomas, > > Could you please also merge this patch? Since you have merged this patch > "x86, boot: Skip relocs when load address unchanged [commit f285f4a21]", > and this issue was raised because it broke kexec/kdump, then I posted > these 2 patches. Without this patch makedumpfile will be broken when > enable kaslr and do the kdump. > > Thanks > Baouqan > > On 09/30/2014 03:08 PM, Baoquan He wrote: >> Now kaslr makes kernel image size changable, not the fixed size 512M. >> So KERNEL_IMAGE_SIZE need be exported to VMCOREINFO, otherwise makedumfile >> will crash. >> >> Signed-off-by: Baoquan He <bhe at redhat.com> >> Acked-by: Kees Cook <keescook at chromium.org> >> Acked-by: Vivek Goyal <vgoyal at redhat.com> >> --- >> kernel/kexec.c | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/kernel/kexec.c b/kernel/kexec.c >> index 2bee072..bd680d3 100644 >> --- a/kernel/kexec.c >> +++ b/kernel/kexec.c >> @@ -2003,6 +2003,9 @@ static int __init crash_save_vmcoreinfo_init(void) >> #endif >> VMCOREINFO_NUMBER(PG_head_mask); >> VMCOREINFO_NUMBER(PAGE_BUDDY_MAPCOUNT_VALUE); >> +#ifdef CONFIG_X86 >> + VMCOREINFO_NUMBER(KERNEL_IMAGE_SIZE); >> +#endif >> #ifdef CONFIG_HUGETLBFS >> VMCOREINFO_SYMBOL(free_huge_page); >> #endif >> > -- Kees Cook Chrome OS Security
