From: Jiri Slaby <jslaby@suse.cz>
To: jirislaby@gmail.com
Cc: Oleg Nesterov <oleg@redhat.com>,
akpm@linux-foundation.org, adobriyan@gmail.com,
nhorman@tuxdriver.com, Stephen Smalley <sds@tycho.nsa.gov>,
James Morris <jmorris@namei.org>,
Eric Paris <eparis@parisplace.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH v4 10/12] rlimits: switch more rlimit syscalls to do_prlimit
Date: Wed, 23 Jun 2010 23:52:11 +0200 [thread overview]
Message-ID: <1277329933-8139-10-git-send-email-jslaby@suse.cz> (raw)
In-Reply-To: <1277329933-8139-1-git-send-email-jslaby@suse.cz>
From: Jiri Slaby <jirislaby@gmail.com>
After we added more generic do_prlimit, switch sys_getrlimit to that.
Also switch compat handling, so we can get rid of ugly __user casts
and avoid setting process' address limit to kernel data and back.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
kernel/compat.c | 17 +++--------------
kernel/sys.c | 17 ++++++++---------
2 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/kernel/compat.c b/kernel/compat.c
index 5adab05..e167efc 100644
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -279,11 +279,6 @@ asmlinkage long compat_sys_setrlimit(unsigned int resource,
struct compat_rlimit __user *rlim)
{
struct rlimit r;
- int ret;
- mm_segment_t old_fs = get_fs ();
-
- if (resource >= RLIM_NLIMITS)
- return -EINVAL;
if (!access_ok(VERIFY_READ, rlim, sizeof(*rlim)) ||
__get_user(r.rlim_cur, &rlim->rlim_cur) ||
@@ -294,10 +289,7 @@ asmlinkage long compat_sys_setrlimit(unsigned int resource,
r.rlim_cur = RLIM_INFINITY;
if (r.rlim_max == COMPAT_RLIM_INFINITY)
r.rlim_max = RLIM_INFINITY;
- set_fs(KERNEL_DS);
- ret = sys_setrlimit(resource, (struct rlimit __user *) &r);
- set_fs(old_fs);
- return ret;
+ return do_prlimit(current, resource, &r, NULL);
}
#ifdef COMPAT_RLIM_OLD_INFINITY
@@ -329,16 +321,13 @@ asmlinkage long compat_sys_old_getrlimit(unsigned int resource,
#endif
-asmlinkage long compat_sys_getrlimit (unsigned int resource,
+asmlinkage long compat_sys_getrlimit(unsigned int resource,
struct compat_rlimit __user *rlim)
{
struct rlimit r;
int ret;
- mm_segment_t old_fs = get_fs();
- set_fs(KERNEL_DS);
- ret = sys_getrlimit(resource, (struct rlimit __user *) &r);
- set_fs(old_fs);
+ ret = do_prlimit(current, resource, NULL, &r);
if (!ret) {
if (r.rlim_cur > COMPAT_RLIM_INFINITY)
r.rlim_cur = COMPAT_RLIM_INFINITY;
diff --git a/kernel/sys.c b/kernel/sys.c
index bc7d1be..9da98dd 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1236,15 +1236,14 @@ SYSCALL_DEFINE2(setdomainname, char __user *, name, int, len)
SYSCALL_DEFINE2(getrlimit, unsigned int, resource, struct rlimit __user *, rlim)
{
- if (resource >= RLIM_NLIMITS)
- return -EINVAL;
- else {
- struct rlimit value;
- task_lock(current->group_leader);
- value = current->signal->rlim[resource];
- task_unlock(current->group_leader);
- return copy_to_user(rlim, &value, sizeof(*rlim)) ? -EFAULT : 0;
- }
+ struct rlimit value;
+ int ret;
+
+ ret = do_prlimit(current, resource, NULL, &value);
+ if (!ret)
+ ret = copy_to_user(rlim, &value, sizeof(*rlim)) ? -EFAULT : 0;
+
+ return ret;
}
#ifdef __ARCH_WANT_SYS_OLD_GETRLIMIT
--
1.7.1
next prev parent reply other threads:[~2010-06-23 21:54 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-23 21:52 [PATCH v4 01/12] rlimits: security, add task_struct to setrlimit Jiri Slaby
2010-06-23 21:52 ` [PATCH v4 02/12] rlimits: add task_struct to update_rlimit_cpu Jiri Slaby
2010-06-23 21:52 ` [PATCH v4 03/12] rlimits: make sure ->rlim_max never grows in sys_setrlimit Jiri Slaby
2010-06-23 21:52 ` [PATCH v4 04/12] rlimits: selinux, do rlimits changes under task_lock Jiri Slaby
2010-06-23 21:52 ` [PATCH v4 05/12] rlimits: split sys_setrlimit Jiri Slaby
2010-06-23 21:52 ` [PATCH v4 06/12] rlimits: allow setrlimit to non-current tasks Jiri Slaby
2010-06-23 21:52 ` [PATCH v4 07/12] rlimits: do security check under task_lock Jiri Slaby
2010-06-23 21:52 ` [PATCH v4 08/12] rlimits: add rlimit64 structure Jiri Slaby
2010-06-23 21:52 ` [PATCH v4 09/12] rlimits: redo do_setrlimit to more generic do_prlimit Jiri Slaby
2010-06-23 21:52 ` Jiri Slaby [this message]
2010-06-23 21:52 ` [PATCH v4 11/12] rlimits: implement prlimit64 syscall Jiri Slaby
2010-06-23 21:52 ` [PATCH v4 12/12] unistd: add __NR_prlimit64 syscall numbers Jiri Slaby
2010-06-23 23:58 ` [PATCH v4 01/12] rlimits: security, add task_struct to setrlimit James Morris
2010-07-02 11:30 ` Jiri Slaby
2010-07-05 0:32 ` 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=1277329933-8139-10-git-send-email-jslaby@suse.cz \
--to=jslaby@suse.cz \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=eparis@parisplace.org \
--cc=jirislaby@gmail.com \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=oleg@redhat.com \
--cc=sds@tycho.nsa.gov \
/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®