On Fri, 17 Jul 2020 at 22:45, Arvind Sankar <nivedita@xxxxxxxxxxxx> wrote:
>
> When remapping the kernel rodata section RO in the EFI pagetables, the
> protection flags that were used for the text section are being reused,
> but the rodata section should not be marked executable.
>
> Signed-off-by: Arvind Sankar <nivedita@xxxxxxxxxxxx>
Thanks Arvind.
As this affects mixed mode only, I will park this for now, and send it
out once I have accumulated some more changes.
> ---
> arch/x86/platform/efi/efi_64.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
> index 8e364c4c6768..7caa65837356 100644
> --- a/arch/x86/platform/efi/efi_64.c
> +++ b/arch/x86/platform/efi/efi_64.c
> @@ -268,6 +268,8 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
> npages = (__end_rodata - __start_rodata) >> PAGE_SHIFT;
> rodata = __pa(__start_rodata);
> pfn = rodata >> PAGE_SHIFT;
> +
> + pf = _PAGE_NX | _PAGE_ENC;
> if (kernel_map_pages_in_pgd(pgd, pfn, rodata, npages, pf)) {
> pr_err("Failed to map kernel rodata 1:1\n");
> return 1;
> --
> 2.26.2
>
