[PATCH] mm/mmap: Replace SHM_HUGE_MASK with MAP_HUGE_MASK inside mmap_pgoff

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Anshuman Khandual <khandual@linux.vnet.ibm.com>
Newsgroups	linux.kernel
Subject	[PATCH] mm/mmap: Replace SHM_HUGE_MASK with MAP_HUGE_MASK inside mmap_pgoff
Date	Tue, 04 Apr 2017 07:00:02 +0200
Message-ID	<tsoJs-8um-17@gated-at.bofh.it> (permalink)
X-Mailer	git-send-email 2.9.3
X-Tm-As-Mml	disable
X-Cbid	17040404-0052-0000-0000-0000022B2E0F
X-Ibm-Av-Detection	SAVI=unused REMOTE=unused XFE=unused
X-Cbparentid	17040404-0053-0000-0000-00000804351D
X-Proofpoint-Virus-Version	vendor=fsecure engine=2.50.10432:,, definitions=2017-04-04_03:,, signatures=0
X-Proofpoint-Spam-Details	rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1704040045
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	31
Organization	linux.* mail to news gateway
X-Original-Cc	mhocko@suse.com, vbabka@suse.cz, mgorman@suse.de, bsingharora@gmail.com, akpm@linux-foundation.org
X-Original-Date	Tue, 4 Apr 2017 10:26:35 +0530
X-Original-Message-ID	<20170404045635.616-1-khandual@linux.vnet.ibm.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1615708

Show key headers only | View raw

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 <bsingharora@gmail.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Anshuman Khandual <khandual@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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] mm/mmap: Replace SHM_HUGE_MASK with MAP_HUGE_MASK inside mmap_pgoff Anshuman Khandual <khandual@linux.vnet.ibm.com> - 2017-04-04 07:00 +0200
  Re: [PATCH] mm/mmap: Replace SHM_HUGE_MASK with MAP_HUGE_MASK inside  mmap_pgoff Matthew Wilcox <willy@infradead.org> - 2017-04-04 14:10 +0200

csiph-web