From: Scott Wood <scottwood@freescale.com>
Date: Mon, 24 Aug 2015 16:43:03 +0000 (-0500)
Subject: powerpc/fsl_pci: Check for get_user/probe_kernel_address failure
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=072daeed5525a0d8ad1e5ddfb38f29cef1ca25f2;p=deliverable%2Flinux.git

powerpc/fsl_pci: Check for get_user/probe_kernel_address failure

Signed-off-by: Scott Wood <scottwood@freescale.com>
Reported-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Hongtao Jia <hongtao.jia@freescale.com>
---

diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index ebc1f412cf49..c42609dde8d2 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -1002,7 +1002,7 @@ int fsl_pci_mcheck_exception(struct pt_regs *regs)
 			ret = probe_kernel_address(regs->nip, inst);
 		}
 
-		if (mcheck_handle_load(regs, inst)) {
+		if (!ret && mcheck_handle_load(regs, inst)) {
 			regs->nip += 4;
 			return 1;
 		}