summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/align.c
diff options
context:
space:
mode:
authorPaul Mackerras2017-10-25 09:16:53 +0200
committerMichael Ellerman2017-10-25 12:42:35 +0200
commit158f19698b594eb8a1bdf7d7937617abfaa4c4d9 (patch)
treed603611d3f2ede17a372cb8330d1c1e30dcb437e /arch/powerpc/kernel/align.c
parentpowerpc/perf: Fix IMC allocation routine (diff)
downloadkernel-qcow2-linux-158f19698b594eb8a1bdf7d7937617abfaa4c4d9.tar.gz
kernel-qcow2-linux-158f19698b594eb8a1bdf7d7937617abfaa4c4d9.tar.xz
kernel-qcow2-linux-158f19698b594eb8a1bdf7d7937617abfaa4c4d9.zip
powerpc: Fix check for copy/paste instructions in alignment handler
Commit 07d2a628bc00 ("powerpc/64s: Avoid cpabort in context switch when possible", 2017-06-09) changed the definition of PPC_INST_COPY and in so doing inadvertently broke the check for copy/paste instructions in the alignment fault handler. The check currently matches no instructions. This fixes it by ANDing both sides of the comparison with the mask. Fixes: 07d2a628bc00 ("powerpc/64s: Avoid cpabort in context switch when possible") Cc: stable@vger.kernel.org # v4.13+ Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de> Signed-off-by: Paul Mackerras <paulus@ozlabs.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/align.c')
-rw-r--r--arch/powerpc/kernel/align.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/align.c b/arch/powerpc/kernel/align.c
index 43ef25156480..3e6c0744c174 100644
--- a/arch/powerpc/kernel/align.c
+++ b/arch/powerpc/kernel/align.c
@@ -332,7 +332,7 @@ int fix_alignment(struct pt_regs *regs)
* when pasting to a co-processor. Furthermore, paste_last is the
* synchronisation point for preceding copy/paste sequences.
*/
- if ((instr & 0xfc0006fe) == PPC_INST_COPY)
+ if ((instr & 0xfc0006fe) == (PPC_INST_COPY & 0xfc0006fe))
return -EIO;
r = analyse_instr(&op, regs, instr);