diff options
| -rw-r--r-- | kernel/sys.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 3082eaf4f2c9..605ab9c7be92 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -1250,11 +1250,14 @@ int setrlimit(struct task_struct *tsk, unsigned int resource, if (resource == RLIMIT_NOFILE && new_rlim->rlim_max > sysctl_nr_open) return -EPERM; - /* protect tsk->signal and tsk->sighand from disappearing */ - read_lock(&tasklist_lock); - if (!tsk->sighand) { - retval = -ESRCH; - goto out; + /* optimization: 'current' doesn't need locking, e.g. setrlimit */ + if (tsk != current) { + /* protect tsk->signal and tsk->sighand from disappearing */ + read_lock(&tasklist_lock); + if (!tsk->sighand) { + retval = -ESRCH; + goto out; + } } retval = security_task_setrlimit(tsk, resource, new_rlim); @@ -1294,7 +1297,8 @@ int setrlimit(struct task_struct *tsk, unsigned int resource, update_rlimit_cpu(tsk, new_rlim->rlim_cur); out: - read_unlock(&tasklist_lock); + if (tsk != current) + read_unlock(&tasklist_lock); return retval; } |