diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-16 15:11:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-16 15:11:25 -0700 |
| commit | 01565479e99882e873e4dd2f6f067b7cba3acf8f (patch) | |
| tree | 014de0c29378ef1380ab6bb48baca135468aca35 /arch/x86/kernel | |
| parent | 8ed1f0e22f49ef42e63875fd2529389a32ff3566 (diff) | |
| parent | 12e244f4b550498bbaf654a52f93633f7dde2dc7 (diff) | |
| download | linux-01565479e99882e873e4dd2f6f067b7cba3acf8f.tar.gz linux-01565479e99882e873e4dd2f6f067b7cba3acf8f.tar.bz2 linux-01565479e99882e873e4dd2f6f067b7cba3acf8f.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Merge x86 fixes from Ingo Molnar:
"Two followup fixes related to the previous LDT fix"
Also applied a further FPU emulation fix from Andy Lutomirski to the
branch before actually merging it.
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
x86/ldt: Further fix FPU emulation
x86/ldt: Correct FPU emulation access to LDT
x86/ldt: Correct LDT access in single stepping logic
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/step.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c index 6273324186ac..0ccb53a9fcd9 100644 --- a/arch/x86/kernel/step.c +++ b/arch/x86/kernel/step.c @@ -28,11 +28,11 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re struct desc_struct *desc; unsigned long base; - seg &= ~7UL; + seg >>= 3; mutex_lock(&child->mm->context.lock); if (unlikely(!child->mm->context.ldt || - (seg >> 3) >= child->mm->context.ldt->size)) + seg >= child->mm->context.ldt->size)) addr = -1L; /* bogus selector, access would fault */ else { desc = &child->mm->context.ldt->entries[seg]; |