[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <159428657103.4006.18418761196662576494.tip-bot2@tip-bot2>
Date: Thu, 09 Jul 2020 09:22:51 -0000
From: "tip-bot2 for Thomas Gleixner" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: syzbot+0889df9502bc0f112b31@...kaller.appspotmail.com,
Thomas Gleixner <tglx@...utronix.de>,
Andy Lutomirski <luto@...nel.org>, x86 <x86@...nel.org>,
LKML <linux-kernel@...r.kernel.org>
Subject: [tip: x86/urgent] x86/traps: Disable interrupts in exc_aligment_check()
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: bce9b042ec73e8662b8119d4ca47e7c78b20d0bf
Gitweb: https://git.kernel.org/tip/bce9b042ec73e8662b8119d4ca47e7c78b20d0bf
Author: Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Wed, 08 Jul 2020 21:28:05 +02:00
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitterDate: Thu, 09 Jul 2020 11:18:29 +02:00
x86/traps: Disable interrupts in exc_aligment_check()
exc_alignment_check() fails to disable interrupts before returning to the
entry code.
Fixes: ca4c6a9858c2 ("x86/traps: Make interrupt enable/disable symmetric in C code")
Reported-by: syzbot+0889df9502bc0f112b31@...kaller.appspotmail.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Acked-by: Andy Lutomirski <luto@...nel.org>
Link: https://lkml.kernel.org/r/20200708192934.076519438@linutronix.de
---
arch/x86/kernel/traps.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 6ed8cc5..4f3a509 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -299,6 +299,8 @@ DEFINE_IDTENTRY_ERRORCODE(exc_alignment_check)
do_trap(X86_TRAP_AC, SIGBUS, "alignment check", regs,
error_code, BUS_ADRALN, NULL);
+
+ local_irq_disable();
}
#ifdef CONFIG_VMAP_STACK
Powered by blists - more mailing lists