diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2010-05-04 11:28:25 +0200 |
|---|---|---|
| committer | Jiri Slaby <jirislaby@gmail.com> | 2010-07-16 09:48:48 +0200 |
| commit | b95183453af2ed14a5c7027e58049c9fd17e92ce (patch) | |
| tree | 8db2687b9508de182615915c7df1edf26d08638c /kernel/sys.c | |
| parent | rlimits: redo do_setrlimit to more generic do_prlimit (diff) | |
| download | linux-b95183453af2ed14a5c7027e58049c9fd17e92ce.tar.xz linux-b95183453af2ed14a5c7027e58049c9fd17e92ce.zip | |
rlimits: switch more rlimit syscalls to do_prlimit
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>
Diffstat (limited to 'kernel/sys.c')
| -rw-r--r-- | kernel/sys.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index bc7d1be0960e..9da98dd47276 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 |