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.
Acked-by: Balbir Singh <bsinghar...@gmail.com> Acked-by: Michal Hocko <mho...@suse.com> Signed-off-by: Anshuman Khandual <khand...@linux.vnet.ibm.com> --- Posted this last year (https://patchwork.kernel.org/patch/8768891/) and then forgot to follow up. Sorry about that. mm/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/mmap.c b/mm/mmap.c index bfbe885..f82741e 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1479,7 +1479,7 @@ unsigned long do_mmap(struct file *file, unsigned long addr, 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; -- 1.8.5.2