From: Nitin Gupta <nitin.m.gupta@oracle.com>
Date: Fri, 24 Mar 2017 20:06:22 +0000 (-0700)
Subject: sparc64: Fix address range for page table free Orabug: 25704426
X-Git-Tag: v4.1.12-98.0.20170517_2143~33^2~18
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a4448f20dcce5a13223d99a172310fd375c2c123;p=users%2Fjedix%2Flinux-maple.git

sparc64: Fix address range for page table free Orabug: 25704426

Signed-off-by: Nitin Gupta <nitin.m.gupta@oracle.com>
Signed-off-by: Allen Pais <allen.pais@oracle.com>
---

diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
index 90c25b5bc113c..d56e587922273 100644
--- a/arch/sparc/mm/hugetlbpage.c
+++ b/arch/sparc/mm/hugetlbpage.c
@@ -473,6 +473,22 @@ void hugetlb_free_pgd_range(struct mmu_gather *tlb,
 	pgd_t *pgd;
 	unsigned long next;
 
+	addr &= PMD_MASK;
+	if (addr < floor) {
+		addr += PMD_SIZE;
+		if (!addr)
+			return;
+	}
+	if (ceiling) {
+		ceiling &= PMD_MASK;
+		if (!ceiling)
+			return;
+	}
+	if (end - 1 > ceiling - 1)
+		end -= PMD_SIZE;
+	if (addr > end - 1)
+		return;
+
 	pgd = pgd_offset(tlb->mm, addr);
 	do {
 		next = pgd_addr_end(addr, end);