parisc: also set iaoq_b in instruction_pointer_set()

Sven Schnelle · hdeller · commit f324fa583277 · 2019-04-06T19:07:55.000+02:00
When setting the instruction pointer on PA-RISC we also need to set the back of the instruction queue to the new offset, otherwise we will execute on instruction from the new location, and jumping back to the old location stored in iaoq_b. Signed-off-by: Sven Schnelle <svens@stackframe.org> Signed-off-by: Helge Deller <deller@gmx.de> Fixes: 75ebedf ("parisc: Add HAVE_REGS_AND_STACK_ACCESS_API feature") Cc: stable@vger.kernel.org # 4.19+
diff --git a/arch/parisc/include/asm/ptrace.h b/arch/parisc/include/asm/ptrace.h
@@ -28,7 +28,8 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
 static inline void instruction_pointer_set(struct pt_regs *regs,
 						unsigned long val)
 {
-        regs->iaoq[0] = val;
+	regs->iaoq[0] = val;
+	regs->iaoq[1] = val + 4;
 }
 
 /* Query offset/name of register from its name/offset */

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,8 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)`
`28`	`28`	`static inline void instruction_pointer_set(struct pt_regs *regs,`
`29`	`29`	`unsigned long val)`
`30`	`30`	`{`
`31`		`- regs->iaoq[0] = val;`
	`31`	`+ regs->iaoq[0] = val;`
	`32`	`+ regs->iaoq[1] = val + 4;`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`/* Query offset/name of register from its name/offset */`