On Fri, 16 Nov 2007, Eric Paris wrote:
> +#ifdef CONFIG_SECURITY
> + /*
> + * If a hint addr is less than mmap_min_addr change addr to be as
> + * low as possible but still greater than mmap_min_addr
> + */
> + if (!(flags & MAP_FIXED) && ((void *)addr != NULL) &&
> + (addr < mmap_min_addr))
> + addr = PAGE_ALIGN(mmap_min_addr);
> +#endif
Please make this a static inline which is optimized away with
!CONFIG_SECURITY.
> +
> error = arch_mmap_check(addr, len, flags);
> if (error)
> return error;
> diff --git a/mm/nommu.c b/mm/nommu.c
> index 35622c5..ea4d20a 100644
> --- a/mm/nommu.c
> +++ b/mm/nommu.c
> @@ -829,6 +829,16 @@ unsigned long do_mmap_pgoff(struct file *file,
> void *result;
> int ret;
>
> +#ifdef CONFIG_SECURITY
> + /*
> + * If a hint addr is less than mmap_min_addr change addr to be as
> + * low as possible, but still greater than mmap_min_addr
> + */
> + if (!(flags & MAP_FIXED) && ((void *)addr != NULL) &&
> + (addr < mmap_min_addr))
> + addr = PAGE_ALIGN(mmap_min_addr);
> +#endif
> +
> /* decide whether we should attempt the mapping, and if so what sort of
> * mapping */
> ret = validate_mmap_request(file, addr, len, prot, flags, pgoff,
>
>
--
James Morris
<[email protected]>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
