From: Mark Rutland <mark.rutland@arm.com>
To: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org,
kernel-hardening@lists.openwall.com, catalin.marinas@arm.com,
will.deacon@arm.com, labbott@fedoraproject.org,
kvmarm@lists.cs.columbia.edu, marc.zyngier@arm.com,
keescook@chromium.org, andre.przywara@arm.com,
james.morse@arm.com, suzuki.poulose@arm.com
Subject: [kernel-hardening] Re: [PATCH v4 5/6] arm64: mmu: apply strict permissions to .init.text and .init.data
Date: Tue, 7 Mar 2017 14:21:40 +0000 [thread overview]
Message-ID: <20170307142140.GB3514@leverpostej> (raw)
In-Reply-To: <1488637848-13588-6-git-send-email-ard.biesheuvel@linaro.org>
On Sat, Mar 04, 2017 at 02:30:47PM +0000, Ard Biesheuvel wrote:
> diff --git a/arch/arm64/include/asm/sections.h b/arch/arm64/include/asm/sections.h
> index 4e7e7067afdb..22582819b2e5 100644
> --- a/arch/arm64/include/asm/sections.h
> +++ b/arch/arm64/include/asm/sections.h
> @@ -24,7 +24,8 @@ extern char __hibernate_exit_text_start[], __hibernate_exit_text_end[];
> extern char __hyp_idmap_text_start[], __hyp_idmap_text_end[];
> extern char __hyp_text_start[], __hyp_text_end[];
> extern char __idmap_text_start[], __idmap_text_end[];
> +extern char __initdata_begin[], __initdata_end[];
> +extern char __inittext_begin[], __inittext_end[];
> extern char __irqentry_text_start[], __irqentry_text_end[];
> extern char __mmuoff_data_start[], __mmuoff_data_end[];
> -
> #endif /* __ASM_SECTIONS_H */
Unintended whitespace change?
Please restore the line above the endif.
> diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
> index b8deffa9e1bf..2c93d259046c 100644
> --- a/arch/arm64/kernel/vmlinux.lds.S
> +++ b/arch/arm64/kernel/vmlinux.lds.S
> @@ -143,12 +143,27 @@ SECTIONS
>
> . = ALIGN(SEGMENT_ALIGN);
> __init_begin = .;
> + __inittext_begin = .;
>
> INIT_TEXT_SECTION(8)
> .exit.text : {
> ARM_EXIT_KEEP(EXIT_TEXT)
> }
>
> + . = ALIGN(4);
> + .altinstructions : {
> + __alt_instructions = .;
> + *(.altinstructions)
> + __alt_instructions_end = .;
> + }
> + .altinstr_replacement : {
> + *(.altinstr_replacement)
> + }
> +
> + . = ALIGN(PAGE_SIZE);
Arguably this should be SEGMENT_ALIGN for consitency, but given this is
just .init* this should be fine.
> + __inittext_end = .;
> + __initdata_begin = .;
> +
> .init.data : {
> INIT_DATA
> INIT_SETUP(16)
[...]
> diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
> index edd982f88714..0612573ef869 100644
> --- a/arch/arm64/mm/mmu.c
> +++ b/arch/arm64/mm/mmu.c
> @@ -459,14 +459,18 @@ early_param("rodata", parse_rodata);
> */
> static void __init map_kernel(pgd_t *pgd)
> {
> - static struct vm_struct vmlinux_text, vmlinux_rodata, vmlinux_init, vmlinux_data;
> + static struct vm_struct vmlinux_text, vmlinux_rodata, vmlinux_inittext,
> + vmlinux_initdata, vmlinux_data;
>
> pgprot_t text_prot = rodata_enabled ? PAGE_KERNEL_ROX : PAGE_KERNEL_EXEC;
>
> map_kernel_segment(pgd, _text, _etext, text_prot, &vmlinux_text);
> - map_kernel_segment(pgd, __start_rodata, __init_begin, PAGE_KERNEL, &vmlinux_rodata);
> - map_kernel_segment(pgd, __init_begin, __init_end, PAGE_KERNEL_EXEC,
> - &vmlinux_init);
> + map_kernel_segment(pgd, __start_rodata, __inittext_begin, PAGE_KERNEL,
> + &vmlinux_rodata);
> + map_kernel_segment(pgd, __inittext_begin, __inittext_end, text_prot,
> + &vmlinux_inittext);
> + map_kernel_segment(pgd, __initdata_begin, __initdata_end, PAGE_KERNEL,
> + &vmlinux_initdata);
> map_kernel_segment(pgd, _data, _end, PAGE_KERNEL, &vmlinux_data);
This all look fine, given text_prot is used for the init text.
With the whitespace restored:
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Mark.
WARNING: multiple messages have this Message-ID (diff)
From: Mark Rutland <mark.rutland@arm.com>
To: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: keescook@chromium.org, kernel-hardening@lists.openwall.com,
marc.zyngier@arm.com, catalin.marinas@arm.com,
will.deacon@arm.com, andre.przywara@arm.com,
kvmarm@lists.cs.columbia.edu,
linux-arm-kernel@lists.infradead.org, labbott@fedoraproject.org
Subject: Re: [PATCH v4 5/6] arm64: mmu: apply strict permissions to .init.text and .init.data
Date: Tue, 7 Mar 2017 14:21:40 +0000 [thread overview]
Message-ID: <20170307142140.GB3514@leverpostej> (raw)
In-Reply-To: <1488637848-13588-6-git-send-email-ard.biesheuvel@linaro.org>
On Sat, Mar 04, 2017 at 02:30:47PM +0000, Ard Biesheuvel wrote:
> diff --git a/arch/arm64/include/asm/sections.h b/arch/arm64/include/asm/sections.h
> index 4e7e7067afdb..22582819b2e5 100644
> --- a/arch/arm64/include/asm/sections.h
> +++ b/arch/arm64/include/asm/sections.h
> @@ -24,7 +24,8 @@ extern char __hibernate_exit_text_start[], __hibernate_exit_text_end[];
> extern char __hyp_idmap_text_start[], __hyp_idmap_text_end[];
> extern char __hyp_text_start[], __hyp_text_end[];
> extern char __idmap_text_start[], __idmap_text_end[];
> +extern char __initdata_begin[], __initdata_end[];
> +extern char __inittext_begin[], __inittext_end[];
> extern char __irqentry_text_start[], __irqentry_text_end[];
> extern char __mmuoff_data_start[], __mmuoff_data_end[];
> -
> #endif /* __ASM_SECTIONS_H */
Unintended whitespace change?
Please restore the line above the endif.
> diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
> index b8deffa9e1bf..2c93d259046c 100644
> --- a/arch/arm64/kernel/vmlinux.lds.S
> +++ b/arch/arm64/kernel/vmlinux.lds.S
> @@ -143,12 +143,27 @@ SECTIONS
>
> . = ALIGN(SEGMENT_ALIGN);
> __init_begin = .;
> + __inittext_begin = .;
>
> INIT_TEXT_SECTION(8)
> .exit.text : {
> ARM_EXIT_KEEP(EXIT_TEXT)
> }
>
> + . = ALIGN(4);
> + .altinstructions : {
> + __alt_instructions = .;
> + *(.altinstructions)
> + __alt_instructions_end = .;
> + }
> + .altinstr_replacement : {
> + *(.altinstr_replacement)
> + }
> +
> + . = ALIGN(PAGE_SIZE);
Arguably this should be SEGMENT_ALIGN for consitency, but given this is
just .init* this should be fine.
> + __inittext_end = .;
> + __initdata_begin = .;
> +
> .init.data : {
> INIT_DATA
> INIT_SETUP(16)
[...]
> diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
> index edd982f88714..0612573ef869 100644
> --- a/arch/arm64/mm/mmu.c
> +++ b/arch/arm64/mm/mmu.c
> @@ -459,14 +459,18 @@ early_param("rodata", parse_rodata);
> */
> static void __init map_kernel(pgd_t *pgd)
> {
> - static struct vm_struct vmlinux_text, vmlinux_rodata, vmlinux_init, vmlinux_data;
> + static struct vm_struct vmlinux_text, vmlinux_rodata, vmlinux_inittext,
> + vmlinux_initdata, vmlinux_data;
>
> pgprot_t text_prot = rodata_enabled ? PAGE_KERNEL_ROX : PAGE_KERNEL_EXEC;
>
> map_kernel_segment(pgd, _text, _etext, text_prot, &vmlinux_text);
> - map_kernel_segment(pgd, __start_rodata, __init_begin, PAGE_KERNEL, &vmlinux_rodata);
> - map_kernel_segment(pgd, __init_begin, __init_end, PAGE_KERNEL_EXEC,
> - &vmlinux_init);
> + map_kernel_segment(pgd, __start_rodata, __inittext_begin, PAGE_KERNEL,
> + &vmlinux_rodata);
> + map_kernel_segment(pgd, __inittext_begin, __inittext_end, text_prot,
> + &vmlinux_inittext);
> + map_kernel_segment(pgd, __initdata_begin, __initdata_end, PAGE_KERNEL,
> + &vmlinux_initdata);
> map_kernel_segment(pgd, _data, _end, PAGE_KERNEL, &vmlinux_data);
This all look fine, given text_prot is used for the init text.
With the whitespace restored:
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Mark.
WARNING: multiple messages have this Message-ID (diff)
From: mark.rutland@arm.com (Mark Rutland)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 5/6] arm64: mmu: apply strict permissions to .init.text and .init.data
Date: Tue, 7 Mar 2017 14:21:40 +0000 [thread overview]
Message-ID: <20170307142140.GB3514@leverpostej> (raw)
In-Reply-To: <1488637848-13588-6-git-send-email-ard.biesheuvel@linaro.org>
On Sat, Mar 04, 2017 at 02:30:47PM +0000, Ard Biesheuvel wrote:
> diff --git a/arch/arm64/include/asm/sections.h b/arch/arm64/include/asm/sections.h
> index 4e7e7067afdb..22582819b2e5 100644
> --- a/arch/arm64/include/asm/sections.h
> +++ b/arch/arm64/include/asm/sections.h
> @@ -24,7 +24,8 @@ extern char __hibernate_exit_text_start[], __hibernate_exit_text_end[];
> extern char __hyp_idmap_text_start[], __hyp_idmap_text_end[];
> extern char __hyp_text_start[], __hyp_text_end[];
> extern char __idmap_text_start[], __idmap_text_end[];
> +extern char __initdata_begin[], __initdata_end[];
> +extern char __inittext_begin[], __inittext_end[];
> extern char __irqentry_text_start[], __irqentry_text_end[];
> extern char __mmuoff_data_start[], __mmuoff_data_end[];
> -
> #endif /* __ASM_SECTIONS_H */
Unintended whitespace change?
Please restore the line above the endif.
> diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
> index b8deffa9e1bf..2c93d259046c 100644
> --- a/arch/arm64/kernel/vmlinux.lds.S
> +++ b/arch/arm64/kernel/vmlinux.lds.S
> @@ -143,12 +143,27 @@ SECTIONS
>
> . = ALIGN(SEGMENT_ALIGN);
> __init_begin = .;
> + __inittext_begin = .;
>
> INIT_TEXT_SECTION(8)
> .exit.text : {
> ARM_EXIT_KEEP(EXIT_TEXT)
> }
>
> + . = ALIGN(4);
> + .altinstructions : {
> + __alt_instructions = .;
> + *(.altinstructions)
> + __alt_instructions_end = .;
> + }
> + .altinstr_replacement : {
> + *(.altinstr_replacement)
> + }
> +
> + . = ALIGN(PAGE_SIZE);
Arguably this should be SEGMENT_ALIGN for consitency, but given this is
just .init* this should be fine.
> + __inittext_end = .;
> + __initdata_begin = .;
> +
> .init.data : {
> INIT_DATA
> INIT_SETUP(16)
[...]
> diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
> index edd982f88714..0612573ef869 100644
> --- a/arch/arm64/mm/mmu.c
> +++ b/arch/arm64/mm/mmu.c
> @@ -459,14 +459,18 @@ early_param("rodata", parse_rodata);
> */
> static void __init map_kernel(pgd_t *pgd)
> {
> - static struct vm_struct vmlinux_text, vmlinux_rodata, vmlinux_init, vmlinux_data;
> + static struct vm_struct vmlinux_text, vmlinux_rodata, vmlinux_inittext,
> + vmlinux_initdata, vmlinux_data;
>
> pgprot_t text_prot = rodata_enabled ? PAGE_KERNEL_ROX : PAGE_KERNEL_EXEC;
>
> map_kernel_segment(pgd, _text, _etext, text_prot, &vmlinux_text);
> - map_kernel_segment(pgd, __start_rodata, __init_begin, PAGE_KERNEL, &vmlinux_rodata);
> - map_kernel_segment(pgd, __init_begin, __init_end, PAGE_KERNEL_EXEC,
> - &vmlinux_init);
> + map_kernel_segment(pgd, __start_rodata, __inittext_begin, PAGE_KERNEL,
> + &vmlinux_rodata);
> + map_kernel_segment(pgd, __inittext_begin, __inittext_end, text_prot,
> + &vmlinux_inittext);
> + map_kernel_segment(pgd, __initdata_begin, __initdata_end, PAGE_KERNEL,
> + &vmlinux_initdata);
> map_kernel_segment(pgd, _data, _end, PAGE_KERNEL, &vmlinux_data);
This all look fine, given text_prot is used for the init text.
With the whitespace restored:
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Mark.
next prev parent reply other threads:[~2017-03-07 14:21 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-04 14:30 [kernel-hardening] [PATCH v4 0/6] arm64: mmu: avoid W+X mappings and re-enable PTE_CONT for kernel Ard Biesheuvel
2017-03-04 14:30 ` Ard Biesheuvel
2017-03-04 14:30 ` Ard Biesheuvel
2017-03-04 14:30 ` [kernel-hardening] [PATCH v4 1/6] arm: kvm: move kvm_vgic_global_state out of .text section Ard Biesheuvel
2017-03-04 14:30 ` Ard Biesheuvel
2017-03-04 14:30 ` Ard Biesheuvel
2017-03-04 14:30 ` [kernel-hardening] [PATCH v4 2/6] arm64: mmu: move TLB maintenance from callers to create_mapping_late() Ard Biesheuvel
2017-03-04 14:30 ` Ard Biesheuvel
2017-03-04 14:30 ` Ard Biesheuvel
2017-03-04 14:30 ` [kernel-hardening] [PATCH v4 3/6] arm64: alternatives: apply boot time fixups via the linear mapping Ard Biesheuvel
2017-03-04 14:30 ` Ard Biesheuvel
2017-03-04 14:30 ` Ard Biesheuvel
2017-03-04 14:30 ` [kernel-hardening] [PATCH v4 4/6] arm64: mmu: map .text as read-only from the outset Ard Biesheuvel
2017-03-04 14:30 ` Ard Biesheuvel
2017-03-04 14:30 ` Ard Biesheuvel
2017-03-07 14:10 ` [kernel-hardening] " Mark Rutland
2017-03-07 14:10 ` Mark Rutland
2017-03-07 14:10 ` Mark Rutland
2017-03-04 14:30 ` [kernel-hardening] [PATCH v4 5/6] arm64: mmu: apply strict permissions to .init.text and .init.data Ard Biesheuvel
2017-03-04 14:30 ` Ard Biesheuvel
2017-03-04 14:30 ` Ard Biesheuvel
2017-03-07 14:21 ` Mark Rutland [this message]
2017-03-07 14:21 ` Mark Rutland
2017-03-07 14:21 ` Mark Rutland
2017-03-04 14:30 ` [kernel-hardening] [PATCH v4 6/6] arm64: mm: set the contiguous bit for kernel mappings where appropriate Ard Biesheuvel
2017-03-04 14:30 ` Ard Biesheuvel
2017-03-04 14:30 ` Ard Biesheuvel
2017-03-07 16:46 ` [kernel-hardening] " Mark Rutland
2017-03-07 16:46 ` Mark Rutland
2017-03-07 16:46 ` Mark Rutland
2017-03-08 10:57 ` [kernel-hardening] " Ard Biesheuvel
2017-03-08 10:57 ` Ard Biesheuvel
2017-03-08 10:57 ` Ard Biesheuvel
2017-03-08 11:22 ` [kernel-hardening] " Mark Rutland
2017-03-08 11:22 ` Mark Rutland
2017-03-08 11:22 ` Mark Rutland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170307142140.GB3514@leverpostej \
--to=mark.rutland@arm.com \
--cc=andre.przywara@arm.com \
--cc=ard.biesheuvel@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=james.morse@arm.com \
--cc=keescook@chromium.org \
--cc=kernel-hardening@lists.openwall.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=labbott@fedoraproject.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=marc.zyngier@arm.com \
--cc=suzuki.poulose@arm.com \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.