From: Jiri Slaby <jirislaby@gmail.com>
To: akpm@linux-foundation.org
Cc: mingo@redhat.com, oleg@redhat.com, linux-kernel@vger.kernel.org,
Jiri Slaby <jirislaby@gmail.com>
Subject: [PATCH 5/6] core: allow setrlimit to non-current tasks
Date: Mon, 31 Aug 2009 20:56:13 +0200 [thread overview]
Message-ID: <1251744974-29398-5-git-send-email-jirislaby@gmail.com> (raw)
In-Reply-To: <1251744974-29398-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 | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/kernel/sys.c b/kernel/sys.c
index 919cebe..777a152 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1244,16 +1244,27 @@ int setrlimit(struct task_struct *tsk, unsigned int resource,
if (new_rlim->rlim_cur > new_rlim->rlim_max)
return -EINVAL;
+
+ /* protect tsk->signal and tsk->sighand from disappearing */
+ read_lock_irq(&tasklist_lock);
+ if (!tsk->signal || !tsk->sighand) {
+ retval = -ESRCH;
+ goto unlock;
+ }
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) {
/*
@@ -1283,7 +1294,10 @@ int setrlimit(struct task_struct *tsk, unsigned int resource,
update_rlimit_cpu(tsk, new_rlim->rlim_cur);
out:
- return 0;
+ retval = 0;
+unlock:
+ read_unlock_irq(&tasklist_lock);
+ return retval;
}
SYSCALL_DEFINE2(setrlimit, unsigned int, resource, struct rlimit __user *, rlim)
--
1.6.3.3
next prev parent reply other threads:[~2009-08-31 18:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-31 18:56 [PATCH 1/6] SECURITY: selinux, fix update_rlimit_cpu parameter Jiri Slaby
2009-08-31 18:56 ` [PATCH 2/6] SECURITY: add task_struct to setrlimit Jiri Slaby
2009-08-31 19:07 ` Eric Paris
2009-09-01 8:51 ` James Morris
2009-08-31 18:56 ` [PATCH 3/6] core: add task_struct to update_rlimit_cpu Jiri Slaby
2009-09-01 8:51 ` James Morris
2009-08-31 18:56 ` [PATCH 4/6] core: split sys_setrlimit Jiri Slaby
2009-08-31 18:56 ` Jiri Slaby [this message]
2009-09-01 16:22 ` [PATCH 5/6] core: allow setrlimit to non-current tasks Oleg Nesterov
2009-08-31 18:56 ` [PATCH 6/6] FS: proc, make limits writable Jiri Slaby
2009-08-31 22:22 ` [PATCH 1/6] SECURITY: selinux, fix update_rlimit_cpu parameter James Morris
2009-09-01 6:20 ` Jiri Slaby
2009-09-01 8:48 ` James Morris
2009-09-01 8:50 ` James Morris
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=1251744974-29398-5-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