[<prev] [next>] [day] [month] [year] [list]
Message-ID: <tip-8f0750f19789cf352d7e24a6cc50f2ab1b4f1372@git.kernel.org>
Date: Wed, 28 Mar 2012 09:46:48 -0700
From: tip-bot for Dan Carpenter <dan.carpenter@...cle.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
stable@...r.kernel.org, tglx@...utronix.de,
dan.carpenter@...cle.com
Subject: [tip:x86/urgent] x86, tls: Off by one limit check
Commit-ID: 8f0750f19789cf352d7e24a6cc50f2ab1b4f1372
Gitweb: http://git.kernel.org/tip/8f0750f19789cf352d7e24a6cc50f2ab1b4f1372
Author: Dan Carpenter <dan.carpenter@...cle.com>
AuthorDate: Sat, 24 Mar 2012 10:52:50 +0300
Committer: H. Peter Anvin <hpa@...or.com>
CommitDate: Wed, 28 Mar 2012 09:39:35 -0700
x86, tls: Off by one limit check
These are used as offsets into an array of GDT_ENTRY_TLS_ENTRIES members
so GDT_ENTRY_TLS_ENTRIES is one past the end of the array.
Signed-off-by: Dan Carpenter <dan.carpenter@...cle.com>
Link: http://lkml.kernel.org/r/20120324075250.GA28258@elgon.mountain
Cc: <stable@...r.kernel.org>
Signed-off-by: H. Peter Anvin <hpa@...or.com>
---
arch/x86/kernel/tls.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
index 6bb7b85..bcfec2d 100644
--- a/arch/x86/kernel/tls.c
+++ b/arch/x86/kernel/tls.c
@@ -163,7 +163,7 @@ int regset_tls_get(struct task_struct *target, const struct user_regset *regset,
{
const struct desc_struct *tls;
- if (pos > GDT_ENTRY_TLS_ENTRIES * sizeof(struct user_desc) ||
+ if (pos >= GDT_ENTRY_TLS_ENTRIES * sizeof(struct user_desc) ||
(pos % sizeof(struct user_desc)) != 0 ||
(count % sizeof(struct user_desc)) != 0)
return -EINVAL;
@@ -198,7 +198,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
struct user_desc infobuf[GDT_ENTRY_TLS_ENTRIES];
const struct user_desc *info;
- if (pos > GDT_ENTRY_TLS_ENTRIES * sizeof(struct user_desc) ||
+ if (pos >= GDT_ENTRY_TLS_ENTRIES * sizeof(struct user_desc) ||
(pos % sizeof(struct user_desc)) != 0 ||
(count % sizeof(struct user_desc)) != 0)
return -EINVAL;
--
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