diff options
author | James Morris <jmorris@namei.org> | 2010-01-17 17:56:22 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-01-17 17:56:22 -0500 |
commit | 2457552d1e6f3183cd93f81c49a8da5fe8bb0e42 (patch) | |
tree | 7ca46caa910012d75617700e4083b3657053cb31 /security/selinux/hooks.c | |
parent | 19439d05b88dafc4e55d9ffce84ccc27cf8b2bcc (diff) | |
parent | 6ccf80eb15ccaca4d3f1ab5162b9ded5eecd9971 (diff) |
Merge branch 'master' into next
Diffstat (limited to 'security/selinux/hooks.c')
-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 7a374c2eb043..9a2ee845e9d4 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -2365,7 +2365,7 @@ static void selinux_bprm_committing_creds(struct linux_binprm *bprm) | |||
2365 | initrlim = init_task.signal->rlim + i; | 2365 | initrlim = init_task.signal->rlim + i; |
2366 | rlim->rlim_cur = min(rlim->rlim_max, initrlim->rlim_cur); | 2366 | rlim->rlim_cur = min(rlim->rlim_max, initrlim->rlim_cur); |
2367 | } | 2367 | } |
2368 | update_rlimit_cpu(rlim->rlim_cur); | 2368 | update_rlimit_cpu(current->signal->rlim[RLIMIT_CPU].rlim_cur); |
2369 | } | 2369 | } |
2370 | } | 2370 | } |
2371 | 2371 | ||