From: "tip-bot2 for Thomas Gleixner" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: syzbot+0889df9502bc0f112b31@syzkaller.appspotmail.com,
Thomas Gleixner <tglx@linutronix.de>,
Andy Lutomirski <luto@kernel.org>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: x86/urgent] x86/traps: Disable interrupts in exc_aligment_check()
Date: Thu, 09 Jul 2020 09:22:51 -0000 [thread overview]
Message-ID: <159428657103.4006.18418761196662576494.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200708192934.076519438@linutronix.de>
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@linutronix.de>
AuthorDate: Wed, 08 Jul 2020 21:28:05 +02:00
Committer: Thomas Gleixner <tglx@linutronix.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@syzkaller.appspotmail.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Andy Lutomirski <luto@kernel.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
next prev parent reply other threads:[~2020-07-09 9:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-08 19:28 [patch 0/3] x86/entry: A couple of small fixes Thomas Gleixner
2020-07-08 19:28 ` [patch 1/3] x86/traps: Disable interrupts in exc_aligment_check() Thomas Gleixner
2020-07-09 9:22 ` tip-bot2 for Thomas Gleixner [this message]
2020-07-08 19:28 ` [patch 2/3] x86/entry: Mark check_user_regs() noinstr Thomas Gleixner
2020-07-09 9:22 ` [tip: x86/urgent] " tip-bot2 for Thomas Gleixner
2020-07-08 19:28 ` [patch 3/3] x86/entry/common: Make prepare_exit_to_usermode() static Thomas Gleixner
2020-07-09 9:22 ` [tip: x86/urgent] " tip-bot2 for Thomas Gleixner
2020-07-08 21:17 ` [patch 0/3] x86/entry: A couple of small fixes Andy Lutomirski
2020-07-09 9:09 ` Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=159428657103.4006.18418761196662576494.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@kernel.org \
--cc=syzbot+0889df9502bc0f112b31@syzkaller.appspotmail.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).