x86: fix brk area initialization
Subsystems (2)
Juergen Gross
maintainerv3 cover x86: fix brk area initialization
The brk area needs to be zeroed initially, like the .bss section. At the same time its memory should be covered by the ELF program headers.
Juergen Gross (3):
x86/xen: use clear_bss() for Xen PV guests
x86: clear .brk area at early boot
x86: fix .brk attribute in linker script
arch/x86/include/asm/setup.h | 3 +++ arch/x86/kernel/head64.c | 4 +++- arch/x86/kernel/vmlinux.lds.S | 2 +- arch/x86/xen/enlighten_pv.c | 8 ++++++-- arch/x86/xen/xen-head.S | 10 +--------- 5 files changed, 14 insertions(+), 13 deletions(-)
Signature · 1 line
2.35.3
Juergen Gross
maintainerPATCH v3 1/3 x86/xen: use clear_bss() for Xen PV guests
Instead of clearing the bss area in assembly code, use the clear_bss() function.
This requires to pass the start_info address as parameter to xen_start_kernel() in order to avoid the xen_start_info being zeroed again.
--- arch/x86/include/asm/setup.h | 3 +++ arch/x86/kernel/head64.c | 2 +- arch/x86/xen/enlighten_pv.c | 8 ++++++-- arch/x86/xen/xen-head.S | 10 +--------- 4 files changed, 11 insertions(+), 12 deletions(-)
arch/x86/include/asm/setup.h +3 -0
@@ -120,6 +120,9 @@ void *extend_brk(size_t size, size_t align); static char __brk_##name[size]extern void probe_roms (void ); + +void clear_bss (void ); +#ifdef __i386__ asmlinkage void __init i386_start_kernel(void);
arch/x86/kernel/head64.c +1 -1
@@ -426,7 +426,7 @@ void __init do_early_exception(struct pt_regs *regs, int trapnr)/* Don't add a printk in there. printk relies on the PDA which is not initialized yet. */ -static void __init clear_bss (void ) +void __init clear_bss (void ) {memset (__bss_start,0 , (unsigned long ) __bss_stop - (unsigned long ) __bss_start);
arch/x86/xen/enlighten_pv.c +6 -2
@@ -1183,15 +1183,19 @@ static void __init xen_domu_set_legacy_features(void)extern void early_xen_iret_patch (void );/* First C function to be called on Xen boot */ -asmlinkage __visible void __init xen_start_kernel(void) +asmlinkage __visible void __init xen_start_kernel(struct start_info *si) {struct physdev_set_iopl set_iopl;unsigned long initrd_start =0 ;int rc; -if (!xen_start_info) +if (!si)return ; +clear_bss (); + + xen_start_info = si; +__text_gen_insn (&early_xen_iret_patch,JMP32_INSN_OPCODE , &early_xen_iret_patch, &xen_iret,JMP32_INSN_SIZE );
arch/x86/xen/xen-head.S +1 -9
@@ -48,15 +48,6 @@ SYM_CODE_START(startup_xen) ANNOTATE_NOENDBR cld - /* Clear .bss */ - xor %eax,%eax - mov $__bss_start, %rdi - mov $__bss_stop, %rcx - sub %rdi, %rcx - shr $3, %rcx - rep stosq - - mov %rsi, xen_start_info mov initial_stack(%rip), %rsp /* Set up %gs.
@@ -71,6 +62,7 @@ SYM_CODE_START(startup_xen) cdq wrmsr + mov %rsi, %rdi call xen_start_kernel SYM_CODE_END(startup_xen) __FINIT
Signature · 1 line
2.35.3
[tip: x86/urgent] x86/xen: Use clear_bss() for Xen PV guests
The following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 96e8fc5818686d4a1591bb6907e7fdb64ef29884 Gitweb: https://git.kernel.org/tip/96e8fc5818686d4a1591bb6907e7fdb64ef29884 Author: Juergen Gross <[email protected]> AuthorDate: Thu, 30 Jun 2022 09:14:39 +02:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Fri, 01 Jul 2022 10:57:52 +02:00
x86/xen: Use clear_bss() for Xen PV guests
Instead of clearing the bss area in assembly code, use the clear_bss() function.
This requires to pass the start_info address as parameter to xen_start_kernel() in order to avoid the xen_start_info being zeroed again.
--- arch/x86/include/asm/setup.h | 3 +++ arch/x86/kernel/head64.c | 2 +- arch/x86/xen/enlighten_pv.c | 8 ++++++-- arch/x86/xen/xen-head.S | 10 +--------- 4 files changed, 11 insertions(+), 12 deletions(-)
arch/x86/include/asm/setup.h +3 -0
@@ -120,6 +120,9 @@ void *extend_brk(size_t size, size_t align); static char __brk_##name[size]extern void probe_roms (void ); + +void clear_bss (void ); +#ifdef __i386__ asmlinkage void __init i386_start_kernel(void);
arch/x86/kernel/head64.c +1 -1
@@ -426,7 +426,7 @@ void __init do_early_exception(struct pt_regs *regs, int trapnr)/* Don't add a printk in there. printk relies on the PDA which is not initialized yet. */ -static void __init clear_bss (void ) +void __init clear_bss (void ) {memset (__bss_start,0 , (unsigned long ) __bss_stop - (unsigned long ) __bss_start);
arch/x86/xen/enlighten_pv.c +6 -2
@@ -1183,15 +1183,19 @@ static void __init xen_domu_set_legacy_features(void)extern void early_xen_iret_patch (void );/* First C function to be called on Xen boot */ -asmlinkage __visible void __init xen_start_kernel(void) +asmlinkage __visible void __init xen_start_kernel(struct start_info *si) {struct physdev_set_iopl set_iopl;unsigned long initrd_start =0 ;int rc; -if (!xen_start_info) +if (!si)return ; +clear_bss (); + + xen_start_info = si; +__text_gen_insn (&early_xen_iret_patch,JMP32_INSN_OPCODE , &early_xen_iret_patch, &xen_iret,JMP32_INSN_SIZE );
arch/x86/xen/xen-head.S +1 -9
@@ -48,15 +48,6 @@ SYM_CODE_START(startup_xen) ANNOTATE_NOENDBR cld - /* Clear .bss */ - xor %eax,%eax - mov $__bss_start, %rdi - mov $__bss_stop, %rcx - sub %rdi, %rcx - shr $3, %rcx - rep stosq - - mov %rsi, xen_start_info mov initial_stack(%rip), %rsp /* Set up %gs.
@@ -71,6 +62,7 @@ SYM_CODE_START(startup_xen) cdq wrmsr + mov %rsi, %rdi call xen_start_kernel SYM_CODE_END(startup_xen) __FINIT
Juergen Gross
maintainerPATCH v3 2/3 x86: clear .brk area at early boot
In reply to Juergen GrossThe .brk section has the same properties as .bss: it is an alloc-only section and should be cleared before being used.
Not doing so is especially a problem for Xen PV guests, as the hypervisor will validate page tables (check for writable page tables and hypervisor private bits) before accepting them to be used.
Make sure .brk is initially zero by letting clear_bss() clear the brk area, too.
--- arch/x86/kernel/head64.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/kernel/head64.c +2 -0
@@ -430,6 +430,8 @@ void __init clear_bss(void) {memset (__bss_start,0 , (unsigned long ) __bss_stop - (unsigned long ) __bss_start); +memset (__brk_base,0 , + (unsigned long ) __brk_limit - (unsigned long ) __brk_base); }static unsigned long get_cmd_line_ptr (void )
Signature · 1 line
2.35.3
[tip: x86/urgent] x86: Clear .brk area at early boot
The following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 38fa5479b41376dc9d7f57e71c83514285a25ca0 Gitweb: https://git.kernel.org/tip/38fa5479b41376dc9d7f57e71c83514285a25ca0 Author: Juergen Gross <[email protected]> AuthorDate: Thu, 30 Jun 2022 09:14:40 +02:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Fri, 01 Jul 2022 11:11:34 +02:00
x86: Clear .brk area at early boot
The .brk section has the same properties as .bss: it is an alloc-only section and should be cleared before being used.
Not doing so is especially a problem for Xen PV guests, as the hypervisor will validate page tables (check for writable page tables and hypervisor private bits) before accepting them to be used.
Make sure .brk is initially zero by letting clear_bss() clear the brk area, too.
--- arch/x86/kernel/head64.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/kernel/head64.c +2 -0
@@ -430,6 +430,8 @@ void __init clear_bss(void) {memset (__bss_start,0 , (unsigned long ) __bss_stop - (unsigned long ) __bss_start); +memset (__brk_base,0 , + (unsigned long ) __brk_limit - (unsigned long ) __brk_base); }static unsigned long get_cmd_line_ptr (void )
Juergen Gross
maintainerPATCH v3 3/3 x86: fix .brk attribute in linker script
In reply to Juergen GrossCommit e32683c6f7d2 ("x86/mm: Fix RESERVE_BRK() for older binutils") added the "NOLOAD" attribute to the .brk section as a "failsafe" measure.
Unfortunately this leads to the linker no longer covering the .brk section in a program header, resulting in the kernel loader not knowing that the memory for the .brk section must be reserved.
This has led to crashes when loading the kernel as PV dom0 under Xen, but other scenarios could be hit by the same problem (e.g. in case an uncompressed kernel is used and the initrd is placed directly behind it).
So drop the "NOLOAD" attribute. This has been verified to correctly cover the .brk section by a program header of the resulting ELF file.
---
V2:
- new patch
--- arch/x86/kernel/vmlinux.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/vmlinux.lds.S +1 -1
@@ -385,7 +385,7 @@ SECTIONS __end_of_kernel_reserve = .; . = ALIGN(PAGE_SIZE); - .brk (NOLOAD) : AT(ADDR(.brk) - LOAD_OFFSET) { + .brk : AT(ADDR(.brk) - LOAD_OFFSET) { __brk_base = .; . += 64 * 1024; /* 64k alignment slop space */ *(.bss..brk) /* areas brk users have reserved */
Signature · 1 line
2.35.3
[tip: x86/urgent] x86: Fix .brk attribute in linker script
The following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 7e09ac27f43b382f5fe9bb7c7f4c465ece1f8a23 Gitweb: https://git.kernel.org/tip/7e09ac27f43b382f5fe9bb7c7f4c465ece1f8a23 Author: Juergen Gross <[email protected]> AuthorDate: Thu, 30 Jun 2022 09:14:41 +02:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Fri, 01 Jul 2022 11:12:43 +02:00
x86: Fix .brk attribute in linker script
Commit in Fixes added the "NOLOAD" attribute to the .brk section as a "failsafe" measure.
Unfortunately, this leads to the linker no longer covering the .brk section in a program header, resulting in the kernel loader not knowing that the memory for the .brk section must be reserved.
This has led to crashes when loading the kernel as PV dom0 under Xen, but other scenarios could be hit by the same problem (e.g. in case an uncompressed kernel is used and the initrd is placed directly behind it).
So drop the "NOLOAD" attribute. This has been verified to correctly cover the .brk section by a program header of the resulting ELF file.
--- arch/x86/kernel/vmlinux.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/vmlinux.lds.S +1 -1
@@ -385,7 +385,7 @@ SECTIONS __end_of_kernel_reserve = .; . = ALIGN(PAGE_SIZE); - .brk (NOLOAD) : AT(ADDR(.brk) - LOAD_OFFSET) { + .brk : AT(ADDR(.brk) - LOAD_OFFSET) { __brk_base = .; . += 64 * 1024; /* 64k alignment slop space */ *(.bss..brk) /* areas brk users have reserved */