diff options
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/hooks.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 576e51199079..3e3fde7c1d2b 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
| @@ -75,6 +75,7 @@ | |||
| 75 | #include <linux/string.h> | 75 | #include <linux/string.h> |
| 76 | #include <linux/selinux.h> | 76 | #include <linux/selinux.h> |
| 77 | #include <linux/mutex.h> | 77 | #include <linux/mutex.h> |
| 78 | #include <linux/posix-timers.h> | ||
| 78 | 79 | ||
| 79 | #include "avc.h" | 80 | #include "avc.h" |
| 80 | #include "objsec.h" | 81 | #include "objsec.h" |
| @@ -2322,13 +2323,7 @@ static void selinux_bprm_post_apply_creds(struct linux_binprm *bprm) | |||
| 2322 | initrlim = init_task.signal->rlim+i; | 2323 | initrlim = init_task.signal->rlim+i; |
| 2323 | rlim->rlim_cur = min(rlim->rlim_max, initrlim->rlim_cur); | 2324 | rlim->rlim_cur = min(rlim->rlim_max, initrlim->rlim_cur); |
| 2324 | } | 2325 | } |
| 2325 | if (current->signal->rlim[RLIMIT_CPU].rlim_cur != RLIM_INFINITY) { | 2326 | update_rlimit_cpu(rlim->rlim_cur); |
| 2326 | /* | ||
| 2327 | * This will cause RLIMIT_CPU calculations | ||
| 2328 | * to be refigured. | ||
| 2329 | */ | ||
| 2330 | current->it_prof_expires = jiffies_to_cputime(1); | ||
| 2331 | } | ||
| 2332 | } | 2327 | } |
| 2333 | 2328 | ||
| 2334 | /* Wake up the parent if it is waiting so that it can | 2329 | /* Wake up the parent if it is waiting so that it can |
