aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-03-24 03:52:50 -0400
committerH. Peter Anvin <hpa@zytor.com>2012-03-28 12:39:35 -0400
commit8f0750f19789cf352d7e24a6cc50f2ab1b4f1372 (patch)
tree45be3ac15f47a9330604d1b21378e8dfa90251b3
parent136d249ef7dbf0fefa292082cc40be1ea864cbd6 (diff)
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@oracle.com> Link: http://lkml.kernel.org/r/20120324075250.GA28258@elgon.mountain Cc: <stable@vger.kernel.org> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--arch/x86/kernel/tls.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
index 6bb7b8579e70..bcfec2d23769 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,
163{ 163{
164 const struct desc_struct *tls; 164 const struct desc_struct *tls;
165 165
166 if (pos > GDT_ENTRY_TLS_ENTRIES * sizeof(struct user_desc) || 166 if (pos >= GDT_ENTRY_TLS_ENTRIES * sizeof(struct user_desc) ||
167 (pos % sizeof(struct user_desc)) != 0 || 167 (pos % sizeof(struct user_desc)) != 0 ||
168 (count % sizeof(struct user_desc)) != 0) 168 (count % sizeof(struct user_desc)) != 0)
169 return -EINVAL; 169 return -EINVAL;
@@ -198,7 +198,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
198 struct user_desc infobuf[GDT_ENTRY_TLS_ENTRIES]; 198 struct user_desc infobuf[GDT_ENTRY_TLS_ENTRIES];
199 const struct user_desc *info; 199 const struct user_desc *info;
200 200
201 if (pos > GDT_ENTRY_TLS_ENTRIES * sizeof(struct user_desc) || 201 if (pos >= GDT_ENTRY_TLS_ENTRIES * sizeof(struct user_desc) ||
202 (pos % sizeof(struct user_desc)) != 0 || 202 (pos % sizeof(struct user_desc)) != 0 ||
203 (count % sizeof(struct user_desc)) != 0) 203 (count % sizeof(struct user_desc)) != 0)
204 return -EINVAL; 204 return -EINVAL;