| From 11d2d3028fb5d90162b2eae194e48588178eaecd Mon Sep 17 00:00:00 2001 |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| Date: Sat, 24 Mar 2012 10:52:50 +0300 |
| Subject: [PATCH] x86, tls: Off by one limit check |
| |
| commit 8f0750f19789cf352d7e24a6cc50f2ab1b4f1372 upstream. |
| |
| 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 |
| Signed-off-by: H. Peter Anvin <hpa@zytor.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| arch/x86/kernel/tls.c | 4 ++-- |
| 1 file 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, |
| { |
| 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; |
| -- |
| 1.8.5.2 |
| |
