1 files changed, 11 insertions, 11 deletions

diff --git a/kernel/sys.c b/kernel/sys.c
index 53de35fc8245..e3c08d4324de 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1145,16 +1145,16 @@ static int groups_to_user(gid_t __user *grouplist,
     struct group_info *group_info)
 {
         int i;
-        int count = group_info->ngroups;
+        unsigned int count = group_info->ngroups;
 
         for (i = 0; i < group_info->nblocks; i++) {
-                int cp_count = min(NGROUPS_PER_BLOCK, count);
-                int off = i * NGROUPS_PER_BLOCK;
-                int len = cp_count * sizeof(*grouplist);
+                unsigned int cp_count = min(NGROUPS_PER_BLOCK, count);
+                unsigned int len = cp_count * sizeof(*grouplist);
 
-                if (copy_to_user(grouplist+off, group_info->blocks[i], len))
+                if (copy_to_user(grouplist, group_info->blocks[i], len))
                         return -EFAULT;
 
+                grouplist += NGROUPS_PER_BLOCK;
                 count -= cp_count;
         }
         return 0;
@@ -1165,16 +1165,16 @@ static int groups_from_user(struct group_info *group_info,
     gid_t __user *grouplist)
 {
         int i;
-        int count = group_info->ngroups;
+        unsigned int count = group_info->ngroups;
 
         for (i = 0; i < group_info->nblocks; i++) {
-                int cp_count = min(NGROUPS_PER_BLOCK, count);
-                int off = i * NGROUPS_PER_BLOCK;
-                int len = cp_count * sizeof(*grouplist);
+                unsigned int cp_count = min(NGROUPS_PER_BLOCK, count);
+                unsigned int len = cp_count * sizeof(*grouplist);
 
-                if (copy_from_user(group_info->blocks[i], grouplist+off, len))
+                if (copy_from_user(group_info->blocks[i], grouplist, len))
                         return -EFAULT;
 
+                grouplist += NGROUPS_PER_BLOCK;
                 count -= cp_count;
         }
         return 0;
@@ -1472,7 +1472,7 @@ asmlinkage long sys_setrlimit(unsigned int resource, struct rlimit __user *rlim)
         if ((new_rlim.rlim_max > old_rlim->rlim_max) &&
             !capable(CAP_SYS_RESOURCE))
                 return -EPERM;
-        if (resource == RLIMIT_NOFILE && new_rlim.rlim_max > NR_OPEN)
+        if (resource == RLIMIT_NOFILE && new_rlim.rlim_max > sysctl_nr_open)
                 return -EPERM;
 
         retval = security_task_setrlimit(resource, &new_rlim);