Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1179148 > unrolled thread

Re: [PATCH 38/42] x86: Fix typo in mark_rodata_ro

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  Re: [PATCH 38/42] x86: Fix typo in mark_rodata_ro Kees Cook <keescook@chromium.org> - 2015-07-08 01:10 +0200

#1179148 — Re: [PATCH 38/42] x86: Fix typo in mark_rodata_ro

On Tue, Jul 7, 2015 at 1:20 PM, Yinghai Lu <yinghai@kernel.org> wrote:
> In the comment, should use cleanup_highmap().
> and also remove not needed cast for _brk_end, as it is
> unsigned long.
>
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>
> ---
>  arch/x86/mm/init_64.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
> index 257ba4b..3b7453a 100644
> --- a/arch/x86/mm/init_64.c
> +++ b/arch/x86/mm/init_64.c
> @@ -1054,9 +1054,9 @@ void mark_rodata_ro(void)
>          * of the PMD will remain mapped executable.
>          *
>          * Any PMD which was setup after the one which covers _brk_end
> -        * has been zapped already via cleanup_highmem().
> +        * has been zapped already via cleanup_highmap().
>          */
> -       all_end = roundup((unsigned long)_brk_end, PMD_SIZE);
> +       all_end = roundup(_brk_end, PMD_SIZE);
>         set_memory_nx(rodata_start, (all_end - rodata_start) >> PAGE_SHIFT);
>
>         rodata_test();

This should also fix the casts in xen/mmu.c, kernel/setup.c, and the
earlier cast in mm/init_64.c.

-Kees

-- 
Kees Cook
Chrome OS Security
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [standalone]

Back to top | Article view | linux.kernel

csiph-web