Răsfoiți Sursa

[PATCH] Add a missing check for irq flags tracing in NMI

NMIs are not supposed to track the irq flags, but TRACE_IRQS_IRETQ
did it anyways. Add a check.

Cc: mingo@elte.hu

Signed-off-by: Andi Kleen <ak@suse.de>
Andi Kleen 18 ani în urmă
părinte
comite
7a0a2dff1c
1 a modificat fișierele cu 2 adăugiri și 0 ștergeri
  1. 2 0
      arch/x86_64/kernel/entry.S

+ 2 - 0
arch/x86_64/kernel/entry.S

@@ -773,7 +773,9 @@ paranoid_exit\trace:
 	testl $3,CS(%rsp)
 	testl $3,CS(%rsp)
 	jnz   paranoid_userspace\trace
 	jnz   paranoid_userspace\trace
 paranoid_swapgs\trace:
 paranoid_swapgs\trace:
+	.if \trace
 	TRACE_IRQS_IRETQ 0
 	TRACE_IRQS_IRETQ 0
+	.endif
 	swapgs
 	swapgs
 paranoid_restore\trace:
 paranoid_restore\trace:
 	RESTORE_ALL 8
 	RESTORE_ALL 8