From: Jiri Slaby <jirislaby@gmail.com>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org, Jiri Slaby <jirislaby@gmail.com>,
Oleg Nesterov <oleg@redhat.com>
Subject: [PATCH -repost 6/8] core: allow setrlimit to non-current tasks
Date: Sat, 17 Oct 2009 23:21:20 +0200 [thread overview]
Message-ID: <1255814482-13994-6-git-send-email-jirislaby@gmail.com> (raw)
In-Reply-To: <1255814482-13994-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 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 | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/kernel/sys.c b/kernel/sys.c
index 2dc84b9..5bb80d6 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1238,6 +1238,7 @@ SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
#endif
+/* make sure you are allowed to change @tsk limits before calling this */
int setrlimit(struct task_struct *tsk, unsigned int resource,
struct rlimit *new_rlim)
{
@@ -1249,9 +1250,16 @@ 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;
+ }
+
retval = security_task_setrlimit(tsk, resource, new_rlim);
if (retval)
- return retval;
+ goto out;
if (resource == RLIMIT_CPU && new_rlim->rlim_cur == 0) {
/*
@@ -1286,6 +1294,7 @@ int setrlimit(struct task_struct *tsk, unsigned int resource,
update_rlimit_cpu(tsk, new_rlim->rlim_cur);
out:
+ read_unlock(&tasklist_lock);
return retval;
}
--
1.6.4.2
next prev parent reply other threads:[~2009-10-17 21:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-17 21:21 [PATCH -repost 1/8] SECURITY: selinux, fix update_rlimit_cpu parameter Jiri Slaby
2009-10-17 21:21 ` [PATCH -repost 2/8] SECURITY: add task_struct to setrlimit Jiri Slaby
2009-10-17 21:21 ` [PATCH -repost 3/8] core: add task_struct to update_rlimit_cpu Jiri Slaby
2009-10-17 21:21 ` [PATCH -repost 4/8] sys_setrlimit: make sure ->rlim_max never grows Jiri Slaby
2009-10-17 21:21 ` [PATCH -repost 5/8] core: split sys_setrlimit Jiri Slaby
2009-10-17 21:21 ` Jiri Slaby [this message]
2009-10-17 21:21 ` [PATCH -repost 7/8] core: optimize setrlimit for current task Jiri Slaby
2009-10-17 21:21 ` [PATCH -repost 8/8] FS: proc, make limits writable Jiri Slaby
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=1255814482-13994-6-git-send-email-jirislaby@gmail.com \
--to=jirislaby@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--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