projects/linux·commit d4fa09e5

Merge branch 'exit-cleanups-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

d4fa09e5 · Linus Torvalds <[email protected]> · 2021-11-13 09:54:24 -08:00

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
Commit
d4fa09e514cdb51fc7a2289c445c44ba0c87117b
Parents
be427a88 · c7a9b647

Merge commit. Changes below are compared with the first parent: be427a88.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
arch/x86/kernel/vm86_32.cmodified+1−1View file

arch/x86/kernel/vm86_32.c

View file
diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
index f14f69d..cce1c89 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;