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

From: Kees Cook
Date: Tue Jul 07 2015 - 19:05:53 EST


On Tue, Jul 7, 2015 at 1:20 PM, Yinghai Lu <yinghai@xxxxxxxxxx> 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@xxxxxxxxxx>
> ---
> 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@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/