From: Jiri Slaby <jslaby@suse.cz>
To: akpm@linux-foundation.org
Cc: adobriyan@gmail.com, nhorman@tuxdriver.com, oleg@redhat.com,
linux-kernel@vger.kernel.org, jirislaby@gmail.com
Subject: [PATCH v3 03/11] rlimits: make sure ->rlim_max never grows in sys_setrlimit
Date: Mon, 10 May 2010 20:00:43 +0200 [thread overview]
Message-ID: <1273514451-28894-3-git-send-email-jslaby@suse.cz> (raw)
In-Reply-To: <1273514451-28894-1-git-send-email-jslaby@suse.cz>
From: Oleg Nesterov <oleg@redhat.com>
Mostly preparation for Jiri's changes, but probably makes sense anyway.
sys_setrlimit() checks new_rlim.rlim_max <= old_rlim->rlim_max, but when
it takes task_lock() old_rlim->rlim_max can be already lowered. Move this
check under task_lock().
Currently this is not important, we can only race with our sub-thread,
this means the application is stupid. But when we change the code to allow
the update of !current task's limits, it becomes important to make sure
->rlim_max can be lowered "reliably" even if we race with the application
doing sys_setrlimit().
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
kernel/sys.c | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/kernel/sys.c b/kernel/sys.c
index f5183b0..d527c46 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1283,10 +1283,6 @@ SYSCALL_DEFINE2(setrlimit, unsigned int, resource, struct rlimit __user *, rlim)
return -EFAULT;
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 > sysctl_nr_open)
return -EPERM;
@@ -1304,11 +1300,16 @@ SYSCALL_DEFINE2(setrlimit, unsigned int, resource, struct rlimit __user *, rlim)
new_rlim.rlim_cur = 1;
}
+ old_rlim = current->signal->rlim + resource;
task_lock(current->group_leader);
- *old_rlim = new_rlim;
+ if ((new_rlim.rlim_max <= old_rlim->rlim_max) ||
+ capable(CAP_SYS_RESOURCE))
+ *old_rlim = new_rlim;
+ else
+ retval = -EPERM;
task_unlock(current->group_leader);
- if (resource != RLIMIT_CPU)
+ if (retval || resource != RLIMIT_CPU)
goto out;
/*
@@ -1322,7 +1323,7 @@ SYSCALL_DEFINE2(setrlimit, unsigned int, resource, struct rlimit __user *, rlim)
update_rlimit_cpu(current, new_rlim.rlim_cur);
out:
- return 0;
+ return retval;
}
/*
--
1.7.1
next prev parent reply other threads:[~2010-05-10 18:01 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-10 18:00 [PATCH v3 01/11] rlimits: security, add task_struct to setrlimit Jiri Slaby
2010-05-10 18:00 ` [PATCH v3 02/11] rlimits: add task_struct to update_rlimit_cpu Jiri Slaby
2010-05-10 18:00 ` Jiri Slaby [this message]
2010-05-10 18:00 ` [PATCH v3 04/11] rlimits: split sys_setrlimit Jiri Slaby
2010-05-10 18:00 ` [PATCH v3 05/11] rlimits: allow setrlimit to non-current tasks Jiri Slaby
2010-05-13 22:56 ` Andrew Morton
2010-06-06 20:23 ` [PATCH v3 06/11] rlimits: do security check under task_lock Jiri Slaby
2010-06-07 18:08 ` Oleg Nesterov
2010-06-23 15:20 ` Jiri Slaby
2010-06-23 16:12 ` Oleg Nesterov
2010-06-23 17:44 ` Jiri Slaby
2010-06-23 17:56 ` Oleg Nesterov
2010-06-23 21:35 ` Jiri Slaby
2010-06-23 18:37 ` Stephen Smalley
2010-05-10 18:00 ` Jiri Slaby
2010-05-13 22:56 ` Andrew Morton
2010-05-10 18:00 ` [PATCH v3 07/11] rlimits: add rlimit64 structure Jiri Slaby
2010-05-10 18:00 ` [PATCH v3 08/11] rlimits: redo do_setrlimit to more generic do_prlimit Jiri Slaby
2010-05-10 18:00 ` [PATCH v3 09/11] rlimits: switch more rlimit syscalls to do_prlimit Jiri Slaby
2010-05-10 18:00 ` [PATCH v3 10/11] rlimits: implement prlimit64 syscall Jiri Slaby
2010-05-13 22:56 ` Andrew Morton
2010-05-26 12:58 ` Jiri Slaby
2010-05-26 14:30 ` Andrew Morton
2010-05-26 15:13 ` Jiri Slaby
2010-05-10 18:00 ` [PATCH v3 11/11] unistd: add __NR_prlimit64 syscall numbers 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=1273514451-28894-3-git-send-email-jslaby@suse.cz \
--to=jslaby@suse.cz \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=jirislaby@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nhorman@tuxdriver.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
all inboxes | Powered by JetHome®