diff options
author | Christoph Lameter <cl@linux-foundation.org> | 2009-06-03 16:04:31 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-06-03 22:07:48 -0400 |
commit | e0a94c2a63f2644826069044649669b5e7ca75d3 (patch) | |
tree | debf8a9af6ac23dadd116dc1cd1f9dcefe9629c6 /include/linux/mm.h | |
parent | 7d2948b1248109dbc7f4aaf9867c54b1912d494c (diff) |
security: use mmap_min_addr indepedently of security models
This patch removes the dependency of mmap_min_addr on CONFIG_SECURITY.
It also sets a default mmap_min_addr of 4096.
mmapping of addresses below 4096 will only be possible for processes
with CAP_SYS_RAWIO.
Signed-off-by: Christoph Lameter <cl@linux-foundation.org>
Acked-by: Eric Paris <eparis@redhat.com>
Looks-ok-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'include/linux/mm.h')
-rw-r--r-- | include/linux/mm.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index bff1f0d475c7..0c21af6abffb 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
@@ -580,12 +580,10 @@ static inline void set_page_links(struct page *page, enum zone_type zone, | |||
580 | */ | 580 | */ |
581 | static inline unsigned long round_hint_to_min(unsigned long hint) | 581 | static inline unsigned long round_hint_to_min(unsigned long hint) |
582 | { | 582 | { |
583 | #ifdef CONFIG_SECURITY | ||
584 | hint &= PAGE_MASK; | 583 | hint &= PAGE_MASK; |
585 | if (((void *)hint != NULL) && | 584 | if (((void *)hint != NULL) && |
586 | (hint < mmap_min_addr)) | 585 | (hint < mmap_min_addr)) |
587 | return PAGE_ALIGN(mmap_min_addr); | 586 | return PAGE_ALIGN(mmap_min_addr); |
588 | #endif | ||
589 | return hint; | 587 | return hint; |
590 | } | 588 | } |
591 | 589 | ||