diff options
| author | Scott Wood <scottwood@freescale.com> | 2015-08-24 18:43:03 +0200 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2015-10-17 07:35:41 +0200 |
| commit | 072daeed5525a0d8ad1e5ddfb38f29cef1ca25f2 (patch) | |
| tree | 95d53cfb45d9a9436b0e465fbf4f0bdb3b780631 /arch/powerpc | |
| parent | powerpc/t104xd4rdb: add DS26522 nodes to device tree (diff) | |
| download | linux-072daeed5525a0d8ad1e5ddfb38f29cef1ca25f2.tar.xz linux-072daeed5525a0d8ad1e5ddfb38f29cef1ca25f2.zip | |
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>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |