diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2009-08-28 10:47:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-02-09 04:50:53 -0800 |
| commit | 6db6aced4d9eb83872d6b63dfd95e3c9d2de37c2 (patch) | |
| tree | b6e7fa2dfa1147e61478b3cbc4d7632a2bc21bd7 /security | |
| parent | 80569f607b59fb59d0e7d86ae6467fefcab8e89b (diff) | |
| download | lwn-6db6aced4d9eb83872d6b63dfd95e3c9d2de37c2.tar.gz lwn-6db6aced4d9eb83872d6b63dfd95e3c9d2de37c2.zip | |
SECURITY: selinux, fix update_rlimit_cpu parameter
commit 17740d89785aeb4143770923d67c293849414710 upstream.
Don't pass current RLIMIT_RTTIME to update_rlimit_cpu() in
selinux_bprm_committing_creds, since update_rlimit_cpu expects
RLIMIT_CPU limit.
Use proper rlim[RLIMIT_CPU].rlim_cur instead to fix that.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Acked-by: James Morris <jmorris@namei.org>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Cc: Eric Paris <eparis@parisplace.org>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/hooks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index bb230d5d7085..36d9e25688f8 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -2366,7 +2366,7 @@ static void selinux_bprm_committing_creds(struct linux_binprm *bprm) initrlim = init_task.signal->rlim + i; rlim->rlim_cur = min(rlim->rlim_max, initrlim->rlim_cur); } - update_rlimit_cpu(rlim->rlim_cur); + update_rlimit_cpu(current->signal->rlim[RLIMIT_CPU].rlim_cur); } } |