From: Jiri Slaby <jirislaby@gmail.com>
To: oleg@redhat.com
Cc: akpm@linux-foundation.org, mingo@redhat.com,
linux-kernel@vger.kernel.org, Jiri Slaby <jirislaby@gmail.com>
Subject: [PATCH 2/2] core: allow setrlimit to non-current tasks
Date: Wed, 2 Sep 2009 11:45:03 +0200 [thread overview]
Message-ID: <1251884703-14523-2-git-send-email-jirislaby@gmail.com> (raw)
In-Reply-To: <1251884703-14523-1-git-send-email-jirislaby@gmail.com>
Add locking to allow setrlimit accept task parameter other than
current.
Namely, lock tasklist_lock for read and check whether the task
structure has signal and sighand non-null. Do all the signal
processing under that lock still held.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
---
kernel/sys.c | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/kernel/sys.c b/kernel/sys.c
index 919cebe..4a55bef 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1240,20 +1240,28 @@ int setrlimit(struct task_struct *tsk, unsigned int resource,
struct rlimit *new_rlim)
{
struct rlimit *old_rlim;
+ unsigned long flags;
int retval;
if (new_rlim->rlim_cur > new_rlim->rlim_max)
return -EINVAL;
+
+ if (lock_task_sighand(tsk, &flags) == NULL)
+ return -ESRCH;
old_rlim = tsk->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 > sysctl_nr_open)
- return -EPERM;
+ !capable(CAP_SYS_RESOURCE)) {
+ retval = -EPERM;
+ goto unlock;
+ }
+ if (resource == RLIMIT_NOFILE && new_rlim->rlim_max > sysctl_nr_open) {
+ retval = -EPERM;
+ goto unlock;
+ }
retval = security_task_setrlimit(tsk, resource, new_rlim);
if (retval)
- return retval;
+ goto unlock;
if (resource == RLIMIT_CPU && new_rlim->rlim_cur == 0) {
/*
@@ -1281,9 +1289,12 @@ int setrlimit(struct task_struct *tsk, unsigned int resource,
if (new_rlim->rlim_cur == RLIM_INFINITY)
goto out;
- update_rlimit_cpu(tsk, new_rlim->rlim_cur);
+ __update_rlimit_cpu(tsk, new_rlim->rlim_cur);
out:
- return 0;
+ retval = 0;
+unlock:
+ unlock_task_sighand(tsk, &flags);
+ return retval;
}
SYSCALL_DEFINE2(setrlimit, unsigned int, resource, struct rlimit __user *, rlim)
--
1.6.3.3
next prev parent reply other threads:[~2009-09-02 9:45 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-02 9:45 [PATCH 1/2] core: add lockless update_rlimit_cpu Jiri Slaby
2009-09-02 9:45 ` Jiri Slaby [this message]
2009-09-02 9:47 ` [PATCH 2/2] core: allow setrlimit to non-current tasks Jiri Slaby
2009-09-02 13:50 ` Oleg Nesterov
2009-09-02 18:44 ` Jiri Slaby
2009-09-02 21:51 ` Oleg Nesterov
2009-09-03 13:47 ` Jiri Slaby
2009-09-03 13:52 ` [PATCH] " Jiri Slaby
2009-09-03 17:41 ` Oleg Nesterov
2009-09-03 20:08 ` [PATCH v2 1/8] SECURITY: selinux, fix update_rlimit_cpu parameter Jiri Slaby
2009-09-03 20:08 ` [PATCH v2 2/8] SECURITY: add task_struct to setrlimit Jiri Slaby
2009-09-03 20:08 ` [PATCH v2 3/8] core: add task_struct to update_rlimit_cpu Jiri Slaby
2009-09-03 20:08 ` [PATCH v2 4/8] sys_setrlimit: make sure ->rlim_max never grows Jiri Slaby
2009-09-03 20:08 ` [PATCH v2 5/8] core: split sys_setrlimit Jiri Slaby
2009-09-03 20:08 ` [PATCH v2 6/8] core: allow setrlimit to non-current tasks Jiri Slaby
2009-09-03 20:08 ` [PATCH v2 7/8] core: optimize setrlimit for current task Jiri Slaby
2009-09-03 20:08 ` [PATCH v2 8/8] FS: proc, make limits writable Jiri Slaby
2009-09-04 14:26 ` Oleg Nesterov
2009-10-08 20:55 ` Jiri Slaby
2009-10-12 15:13 ` Oleg Nesterov
2009-09-03 17:20 ` [PATCH 0/1] sys_setrlimit: make sure ->rlim_max never grows Oleg Nesterov
2009-09-03 17:21 ` [PATCH 1/1] " Oleg Nesterov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1251884703-14523-2-git-send-email-jirislaby@gmail.com \
--to=jirislaby@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=oleg@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome