Re: [PATCH -v2 1/2] x86/asm: Add __PAGE_OFFSET_BASE define on 32-bit

From: Ingo Molnar
Date: Wed Jul 27 2016 - 05:05:39 EST



* Borislav Petkov <bp@xxxxxxx> wrote:

> From: Borislav Petkov <bp@xxxxxxx>
>
> ... in order to avoid ifdeffery in code computing the ASLR randomization
> offset.
>
> Suggested-by: Kees Cook <keescook@xxxxxxxxxxxx>
> Signed-off-by: Borislav Petkov <bp@xxxxxxx>
> ---
> arch/x86/include/asm/page_32_types.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/include/asm/page_32_types.h b/arch/x86/include/asm/page_32_types.h
> index 3a52ee0e726d..3bae4969ac65 100644
> --- a/arch/x86/include/asm/page_32_types.h
> +++ b/arch/x86/include/asm/page_32_types.h
> @@ -13,7 +13,8 @@
> * If you want more physical memory than this then see the CONFIG_HIGHMEM4G
> * and CONFIG_HIGHMEM64G options in the kernel configuration.
> */
> -#define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL)
> +#define __PAGE_OFFSET_BASE _AC(CONFIG_PAGE_OFFSET, UL)
> +#define __PAGE_OFFSET __PAGE_OFFSET_BASE

Could you please send a delta patch for this? I've already applied the original
fix, with a few minor edits.

Thanks,

Ingo