From 4ce46857bea57585b5480a0b52ff0f5b56594ed7 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sat, 24 Mar 2012 10:52:50 +0300 Subject: [PATCH] --- yaml --- r: 297407 b: refs/heads/master c: 8f0750f19789cf352d7e24a6cc50f2ab1b4f1372 h: refs/heads/master i: 297405: 88835e8a4bf0785cf9ab95555c752a291c071e8e 297403: 946199928be31734e3143010177659277ca3544f 297399: 5aba0deebf8d8715858d8a8f1112b9ac7451b062 297391: dc6e124c97fe580e1aed7a88612c71f04815ae52 297375: b2c92e8f8ff3abb16ed527e67d1eb721d90a222f 297343: 33b1e8f43d69bf00e5411f4d4a2a177883995322 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/tls.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e4ef7f0d01ea..ed7a23d489ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 136d249ef7dbf0fefa292082cc40be1ea864cbd6 +refs/heads/master: 8f0750f19789cf352d7e24a6cc50f2ab1b4f1372 diff --git a/trunk/arch/x86/kernel/tls.c b/trunk/arch/x86/kernel/tls.c index 6bb7b8579e70..bcfec2d23769 100644 --- a/trunk/arch/x86/kernel/tls.c +++ b/trunk/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;