diff options
author | Anton Blanchard <anton@samba.org> | 2010-04-06 03:02:19 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-04-06 04:01:35 -0400 |
commit | 84fba5ec91f11c0efb27d0ed6098f7447491f0df (patch) | |
tree | ca48cd8f7baddf29c2bcfc3cc0c7853298449f7b | |
parent | db217dece3003df0841bacf9556b5c06aa097dae (diff) |
sched: Fix sched_getaffinity()
taskset on 2.6.34-rc3 fails on one of my ppc64 test boxes with
the following error:
sched_getaffinity(0, 16, 0x10029650030) = -1 EINVAL (Invalid argument)
This box has 128 threads and 16 bytes is enough to cover it.
Commit cd3d8031eb4311e516329aee03c79a08333141f1 (sched:
sched_getaffinity(): Allow less than NR_CPUS length) is
comparing this 16 bytes agains nr_cpu_ids.
Fix it by comparing nr_cpu_ids to the number of bits in the
cpumask we pass in.
Signed-off-by: Anton Blanchard <anton@samba.org>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Sharyathi Nagesh <sharyath@in.ibm.com>
Cc: Ulrich Drepper <drepper@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Jack Steiner <steiner@sgi.com>
Cc: Russ Anderson <rja@sgi.com>
Cc: Mike Travis <travis@sgi.com>
LKML-Reference: <20100406070218.GM5594@kryten>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 528a10592c16..eaf5c7375dfd 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -4902,7 +4902,7 @@ SYSCALL_DEFINE3(sched_getaffinity, pid_t, pid, unsigned int, len, | |||
4902 | int ret; | 4902 | int ret; |
4903 | cpumask_var_t mask; | 4903 | cpumask_var_t mask; |
4904 | 4904 | ||
4905 | if (len < nr_cpu_ids) | 4905 | if ((len * BITS_PER_BYTE) < nr_cpu_ids) |
4906 | return -EINVAL; | 4906 | return -EINVAL; |
4907 | if (len & (sizeof(unsigned long)-1)) | 4907 | if (len & (sizeof(unsigned long)-1)) |
4908 | return -EINVAL; | 4908 | return -EINVAL; |