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

Commit a10d9a71 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Linus Torvalds
Browse files

i386: fixup TRACE_IRQ breakage 



The TRACE_IRQS_ON function in iret_exc: calls a C function without
ensuring that the segments are set properly. Move the trace function and
the enabling of interrupt into the C stub.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 29eb5110

arch/i386/kernel/entry.S

+0 −2
Original line number Diff line number Diff line
@@ -409,8 +409,6 @@ restore_nocheck_notrace: 
1:	INTERRUPT_RETURN

.section .fixup,"ax"

iret_exc:

	TRACE_IRQS_ON

	ENABLE_INTERRUPTS(CLBR_NONE)

	pushl $0			# no error code

	pushl $do_iret_error

	jmp error_code

arch/i386/kernel/traps.c

+6 −4
Original line number Diff line number Diff line
@@ -518,10 +518,12 @@ fastcall void do_##name(struct pt_regs * regs, long error_code) \ 
	do_trap(trapnr, signr, str, 0, regs, error_code, NULL); \

}



#define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr) \

#define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr, irq) \

fastcall void do_##name(struct pt_regs * regs, long error_code) \

{ \

	siginfo_t info; \

	if (irq) \

		local_irq_enable(); \

	info.si_signo = signr; \

	info.si_errno = 0; \

	info.si_code = sicode; \
@@ -561,13 +563,13 @@ DO_VM86_ERROR( 3, SIGTRAP, "int3", int3) 
#endif

DO_VM86_ERROR( 4, SIGSEGV, "overflow", overflow)

DO_VM86_ERROR( 5, SIGSEGV, "bounds", bounds)

DO_ERROR_INFO( 6, SIGILL,  "invalid opcode", invalid_op, ILL_ILLOPN, regs->eip)

DO_ERROR_INFO( 6, SIGILL,  "invalid opcode", invalid_op, ILL_ILLOPN, regs->eip, 0)

DO_ERROR( 9, SIGFPE,  "coprocessor segment overrun", coprocessor_segment_overrun)

DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS)

DO_ERROR(11, SIGBUS,  "segment not present", segment_not_present)

DO_ERROR(12, SIGBUS,  "stack segment", stack_segment)

DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0)

DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0)

DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0)

DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0, 1)



fastcall void __kprobes do_general_protection(struct pt_regs * regs,

					      long error_code)