[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-136d9d83c07c5e30ac49fc83b27e8c4842f108fc@git.kernel.org>
Date: Sun, 9 Aug 2015 03:22:20 -0700
From: tip-bot for Juergen Gross <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, tglx@...utronix.de,
peterz@...radead.org, jgross@...e.com,
torvalds@...ux-foundation.org, luto@...nel.org, mingo@...nel.org
Subject: [tip:x86/urgent] x86/ldt:
Correct LDT access in single stepping logic
Commit-ID: 136d9d83c07c5e30ac49fc83b27e8c4842f108fc
Gitweb: http://git.kernel.org/tip/136d9d83c07c5e30ac49fc83b27e8c4842f108fc
Author: Juergen Gross <jgross@...e.com>
AuthorDate: Thu, 6 Aug 2015 10:04:38 +0200
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Sat, 8 Aug 2015 10:20:45 +0200
x86/ldt: Correct LDT access in single stepping logic
Commit 37868fe113ff ("x86/ldt: Make modify_ldt synchronous")
introduced a new struct ldt_struct anchored at mm->context.ldt.
convert_ip_to_linear() was changed to reflect this, but indexing
into the ldt has to be changed as the pointer is no longer void *.
Signed-off-by: Juergen Gross <jgross@...e.com>
Reviewed-by: Andy Lutomirski <luto@...nel.org>
Cc: <stable@...r.kernel.org> # On top of: 37868fe113ff: x86/ldt: Make modify_ldt synchronous
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: bp@...e.de
Link: http://lkml.kernel.org/r/1438848278-12906-1-git-send-email-jgross@suse.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/kernel/step.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
index 6273324..0ccb53a 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];
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists