Re: [PATCH 01/10] mm/mmap: Replace SHM_HUGE_MASK with MAP_HUGE_MASK inside mmap_pgoff
From: Michal Hocko <mhocko@kernel.org>
Date: 2016-04-13 07:54:23
Also in:
linux-mm, lkml
On Thu 07-04-16 11:07:35, Anshuman Khandual wrote:
The commit 091d0d55b286 ("shm: fix null pointer deref when userspace
specifies invalid hugepage size") had replaced MAP_HUGE_MASK with
SHM_HUGE_MASK. Though both of them contain the same numeric value of
0x3f, MAP_HUGE_MASK flag sounds more appropriate than the other one
in the context. Hence change it back.Yes, SHM_HUGE_MASK mixing with MAP_HUGE_SHIFT is not only misleading it might bite us later should any of the two change.
Signed-off-by: Anshuman Khandual <redacted>
Acked-by: Michal Hocko <mhocko@suse.com>
quoted hunk ↗ jump to hunk
--- mm/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/mm/mmap.c b/mm/mmap.c index bd2e1a53..7d730a4 100644 --- a/mm/mmap.c +++ b/mm/mmap.c@@ -1315,7 +1315,7 @@ SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len, struct user_struct *user = NULL; struct hstate *hs; - hs = hstate_sizelog((flags >> MAP_HUGE_SHIFT) & SHM_HUGE_MASK); + hs = hstate_sizelog((flags >> MAP_HUGE_SHIFT) & MAP_HUGE_MASK); if (!hs) return -EINVAL;-- 2.1.0 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
-- Michal Hocko SUSE Labs