The patch titled
i386: fix get_segment_eip() with vm86 segments
has been removed from the -mm tree. Its filename is
i386-fix-get_segment_eip-with-vm86.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: i386: fix get_segment_eip() with vm86 segments
From: Chuck Ebbert <76306.1226@xxxxxxxxxxxxxx>
We need to check for vm86 mode first before looking at selector privilege
bits.
Segment limit is always base + 64k and only the low 16 bits of EIP are
significant in vm86 mode.
Signed-off-by: Chuck Ebbert <76306.1226@xxxxxxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Cc: Zachary Amsden <zach@xxxxxxxxxx>
Cc: Rohit Seth <rohitseth@xxxxxxxxxx>
Acked-by: Ananth N Mavinakayanahalli <ananth@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/mm/fault.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff -puN arch/i386/mm/fault.c~i386-fix-get_segment_eip-with-vm86 arch/i386/mm/fault.c
--- a/arch/i386/mm/fault.c~i386-fix-get_segment_eip-with-vm86
+++ a/arch/i386/mm/fault.c
@@ -77,12 +77,15 @@ static inline unsigned long get_segment_
unsigned seg = regs->xcs & 0xffff;
u32 seg_ar, seg_limit, base, *desc;
+ /* Unlikely, but must come before segment checks. */
+ if (unlikely(regs->eflags & VM_MASK)) {
+ base = seg << 4;
+ *eip_limit = base + 0xffff;
+ return base + (eip & 0xffff);
+ }
+
/* The standard kernel/user address space limit. */
*eip_limit = (seg & 3) ? USER_DS.seg : KERNEL_DS.seg;
-
- /* Unlikely, but must come before segment checks. */
- if (unlikely((regs->eflags & VM_MASK) != 0))
- return eip + (seg << 4);
/* By far the most common cases. */
if (likely(seg == __USER_CS || seg == __KERNEL_CS))
_
Patches currently in -mm which might be from 76306.1226@xxxxxxxxxxxxxx are
origin.patch
i386-print-stack-size-in-oops-messages.patch
i386-use-c-code-for-current_thread_info.patch
binfmt_elf-fix-checks-for-bad-address.patch
binfmt_elf-fix-checks-for-bad-address-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
