Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

1 files changed, 11 insertions, 14 deletions

diff --git a/kernel/compat.c b/kernel/compat.c
index 7f40e9275fd9..5adab05a3172 100644
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -495,29 +495,26 @@ asmlinkage long compat_sys_sched_getaffinity(compat_pid_t pid, unsigned int len,
 {
         int ret;
         cpumask_var_t mask;
-        unsigned long *k;
-        unsigned int min_length = cpumask_size();
-
-        if (nr_cpu_ids <= BITS_PER_COMPAT_LONG)
-                min_length = sizeof(compat_ulong_t);
 
-        if (len < min_length)
+        if ((len * BITS_PER_BYTE) < nr_cpu_ids)
+                return -EINVAL;
+        if (len & (sizeof(compat_ulong_t)-1))
                 return -EINVAL;
 
         if (!alloc_cpumask_var(&mask, GFP_KERNEL))
                 return -ENOMEM;
 
         ret = sched_getaffinity(pid, mask);
-        if (ret < 0)
-                goto out;
+        if (ret == 0) {
+                size_t retlen = min_t(size_t, len, cpumask_size());
 
-        k = cpumask_bits(mask);
-        ret = compat_put_bitmap(user_mask_ptr, k, min_length * 8);
-        if (ret == 0)
-                ret = min_length;
-
-out:
+                if (compat_put_bitmap(user_mask_ptr, cpumask_bits(mask), retlen * 8))
+                        ret = -EFAULT;
+                else
+                        ret = retlen;
+        }
         free_cpumask_var(mask);
+
         return ret;
 }