aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-11-13 09:54:24 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2021-11-13 09:54:24 -0800
commitd4fa09e514cdb51fc7a2289c445c44ba0c87117b (patch)
tree4cc2f3df530a3a2eba41aebdfd760cddc410a799 /arch
parentMerge tag 's390-5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux (diff)
parentsignal/vm86_32: Remove pointless test in BUG_ON (diff)
downloadlinux-dev-d4fa09e514cdb51fc7a2289c445c44ba0c87117b.tar.xz
linux-dev-d4fa09e514cdb51fc7a2289c445c44ba0c87117b.zip
Merge branch 'exit-cleanups-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull vm86 fix from Eric Biederman: "Just the removal of an unnecessary (and incorrect) test from a BUG_ON" * 'exit-cleanups-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: signal/vm86_32: Remove pointless test in BUG_ON
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/vm86_32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
index f14f69d7aa3c..cce1c89cb7df 100644
--- a/arch/x86/kernel/vm86_32.c
+++ b/arch/x86/kernel/vm86_32.c
@@ -106,7 +106,7 @@ void save_v86_state(struct kernel_vm86_regs *regs, int retval)
*/
local_irq_enable();
- BUG_ON(!vm86 || !vm86->user_vm86);
+ BUG_ON(!vm86);
set_flags(regs->pt.flags, VEFLAGS, X86_EFLAGS_VIF | vm86->veflags_mask);
user = vm86->user_vm86;