[merged] sched-fix-sched_getaffinity.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     sched: fix sched_getaffinity()
has been removed from the -mm tree.  Its filename was
     sched-fix-sched_getaffinity.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: sched: fix sched_getaffinity()
From: Anton Blanchard <anton@xxxxxxxxx>

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@xxxxxxxxx>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 kernel/sched.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN kernel/sched.c~sched-fix-sched_getaffinity kernel/sched.c
--- a/kernel/sched.c~sched-fix-sched_getaffinity
+++ a/kernel/sched.c
@@ -4909,7 +4909,7 @@ SYSCALL_DEFINE3(sched_getaffinity, pid_t
 	int ret;
 	cpumask_var_t mask;
 
-	if (len < nr_cpu_ids)
+	if ((len * BITS_PER_BYTE) < nr_cpu_ids)
 		return -EINVAL;
 	if (len & (sizeof(unsigned long)-1))
 		return -EINVAL;
_

Patches currently in -mm which might be from anton@xxxxxxxxx are

origin.patch
linux-next.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux