Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa78bcfa authored by Brian Gerst's avatar Brian Gerst Committed by Ingo Molnar
Browse files

x86: use pt_regs pointer in do_device_not_available() 



The generic exception handler (error_code) passes in the pt_regs
pointer and the error code (unused in this case).  The commit
"x86: fix math_emu register frame access" changed this to pass by
value, which doesn't work correctly with stack protector enabled.
Change it back to use the pt_regs pointer.

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent ebd9026d

arch/x86/include/asm/traps.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ dotraplinkage void do_int3(struct pt_regs *, long); 
dotraplinkage void do_overflow(struct pt_regs *, long);

dotraplinkage void do_bounds(struct pt_regs *, long);

dotraplinkage void do_invalid_op(struct pt_regs *, long);

dotraplinkage void do_device_not_available(struct pt_regs);

dotraplinkage void do_device_not_available(struct pt_regs *, long);

dotraplinkage void do_coprocessor_segment_overrun(struct pt_regs *, long);

dotraplinkage void do_invalid_TSS(struct pt_regs *, long);

dotraplinkage void do_segment_not_present(struct pt_regs *, long);

arch/x86/kernel/traps.c

+5 −4
Original line number Diff line number Diff line
@@ -905,19 +905,20 @@ void math_emulate(struct math_emu_info *info) 
}

#endif /* CONFIG_MATH_EMULATION */



dotraplinkage void __kprobes do_device_not_available(struct pt_regs regs)

dotraplinkage void __kprobes

do_device_not_available(struct pt_regs *regs, long error_code)

{

#ifdef CONFIG_X86_32

	if (read_cr0() & X86_CR0_EM) {

		struct math_emu_info info = { };



		conditional_sti(&regs);

		conditional_sti(regs);



		info.regs = &regs;

		info.regs = regs;

		math_emulate(&info);

	} else {

		math_state_restore(); /* interrupts still off */

		conditional_sti(&regs);

		conditional_sti(regs);

	}

#else

	math_state_restore();