From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0113.outbound.protection.outlook.com [207.46.100.113]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id E37411A013E for ; Tue, 25 Aug 2015 02:43:17 +1000 (AEST) From: Scott Wood To: CC: Scott Wood , Andrew Morton , Benjamin Herrenschmidt , Hongtao Jia Subject: [PATCH v2] powerpc/fsl_pci: Check for get_user/probe_kernel_address failure Date: Mon, 24 Aug 2015 11:43:03 -0500 Message-ID: <1440434583-30543-1-git-send-email-scottwood@freescale.com> MIME-Version: 1.0 Content-Type: text/plain List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Signed-off-by: Scott Wood Reported-by: Andrew Morton Cc: Andrew Morton Cc: Benjamin Herrenschmidt Cc: Hongtao Jia --- v2: s/ret/!ret/ arch/powerpc/sysdev/fsl_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index ebc1f412..c42609d 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; } -- 2.1.4