1 files changed, 15 insertions, 11 deletions

diff --git a/kernel/sys.c b/kernel/sys.c
index c0fcad9f826c..9bdf94f3ae29 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1630,20 +1630,21 @@ asmlinkage long sys_old_getrlimit(unsigned int resource, struct rlimit __user *r
 asmlinkage long sys_setrlimit(unsigned int resource, struct rlimit __user *rlim)
 {
         struct rlimit new_rlim, *old_rlim;
+        unsigned long it_prof_secs;
         int retval;
 
         if (resource >= RLIM_NLIMITS)
                 return -EINVAL;
-        if(copy_from_user(&new_rlim, rlim, sizeof(*rlim)))
+        if (copy_from_user(&new_rlim, rlim, sizeof(*rlim)))
                 return -EFAULT;
-       if (new_rlim.rlim_cur > new_rlim.rlim_max)
-               return -EINVAL;
+        if (new_rlim.rlim_cur > new_rlim.rlim_max)
+                return -EINVAL;
         old_rlim = current->signal->rlim + resource;
         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)
-                        return -EPERM;
+                return -EPERM;
 
         retval = security_task_setrlimit(resource, &new_rlim);
         if (retval)
@@ -1653,19 +1654,22 @@ asmlinkage long sys_setrlimit(unsigned int resource, struct rlimit __user *rlim)
         *old_rlim = new_rlim;
         task_unlock(current->group_leader);
 
-        if (resource == RLIMIT_CPU && new_rlim.rlim_cur != RLIM_INFINITY &&
-            (cputime_eq(current->signal->it_prof_expires, cputime_zero) ||
-             new_rlim.rlim_cur <= cputime_to_secs(
-                     current->signal->it_prof_expires))) {
+        if (resource != RLIMIT_CPU)
+                goto out;
+        if (new_rlim.rlim_cur == RLIM_INFINITY)
+                goto out;
+
+        it_prof_secs = cputime_to_secs(current->signal->it_prof_expires);
+        if (it_prof_secs == 0 || new_rlim.rlim_cur <= it_prof_secs) {
                 cputime_t cputime = secs_to_cputime(new_rlim.rlim_cur);
+
                 read_lock(&tasklist_lock);
                 spin_lock_irq(&current->sighand->siglock);
-                set_process_cpu_timer(current, CPUCLOCK_PROF,
-                                      &cputime, NULL);
+                set_process_cpu_timer(current, CPUCLOCK_PROF, &cputime, NULL);
                 spin_unlock_irq(&current->sighand->siglock);
                 read_unlock(&tasklist_lock);
         }
-
+out:
         return 0;
 }