From:   Lars Persson <lars.persson@axis.com>
To:     ralf@linux-mips.org, linux-mips@linux-mips.org,
        linux-kernel@vger.kernel.org
Cc:     Lars Persson <larper@axis.com>
Subject: [PATCH] MIPS: Fix highmem crash in __update_cache.
Date:   Wed, 15 Apr 2015 15:10:54 +0200
Message-Id: <1429103454-29102-1-git-send-email-larper@axis.com>
Original-Recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
Errors-to: linux-mips-bounce@linux-mips.org
Precedence: bulk

Due to a change in flush_dcache_page, highmem pages may have the
dcache dirty flag set. Until there is proper support for highmen in
cache.c we must filter out highmem pages to avoid NULL pointer
dereferences.

Signed-off-by: Lars Persson <larper@axis.com>
---
 arch/mips/mm/cache.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
index 77d96db..46136f6 100644
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
@@ -142,6 +142,10 @@ void __update_cache(struct vm_area_struct *vma, unsigned long address,
 	if (unlikely(!pfn_valid(pfn)))
 		return;
 	page = pfn_to_page(pfn);
+
+	if (PageHighMem(page))
+		return;
+
 	if (page_mapping(page) && Page_dcache_dirty(page)) {
 		addr = (unsigned long) page_address(page);
 		if (exec || pages_do_alias(addr, address & PAGE_MASK))
-- 
1.7.10.4