Fix bsdjail for make-rlimit-settings-per-process-instead-of-per-thread.patch Signed-off-by: Andrew Morton --- 25-akpm/security/bsdjail.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff -puN security/bsdjail.c~bsdjail-rlim-fix security/bsdjail.c --- 25/security/bsdjail.c~bsdjail-rlim-fix 2004-10-06 17:20:43.575870200 -0700 +++ 25-akpm/security/bsdjail.c 2004-10-06 17:21:45.240495752 -0700 @@ -321,16 +321,18 @@ static int enable_jail(struct task_struc if (tsec->nice) set_user_nice(current, tsec->nice); if (tsec->max_data) { - current->rlim[RLIMIT_DATA].rlim_cur = tsec->max_data; - current->rlim[RLIMIT_DATA].rlim_max = tsec->max_data; + current->signal->rlim[RLIMIT_DATA].rlim_cur = tsec->max_data; + current->signal->rlim[RLIMIT_DATA].rlim_max = tsec->max_data; } if (tsec->max_memlock) { - current->rlim[RLIMIT_MEMLOCK].rlim_cur = tsec->max_memlock; - current->rlim[RLIMIT_MEMLOCK].rlim_max = tsec->max_memlock; + current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur = + tsec->max_memlock; + current->signal->rlim[RLIMIT_MEMLOCK].rlim_max = + tsec->max_memlock; } if (tsec->maxtimeslice) { - current->rlim[RLIMIT_CPU].rlim_cur = tsec->maxtimeslice; - current->rlim[RLIMIT_CPU].rlim_max = tsec->maxtimeslice; + current->signal->rlim[RLIMIT_CPU].rlim_cur = tsec->maxtimeslice; + current->signal->rlim[RLIMIT_CPU].rlim_max = tsec->maxtimeslice; } /* success and end */ tsec->mnt = mntget(nd.mnt); @@ -976,16 +978,16 @@ jail_task_alloc_security(struct task_str kref_get(&tsec->kref); tsec->cur_nrtask++; if (tsec->maxtimeslice) { - tsk->rlim[RLIMIT_CPU].rlim_max = tsec->maxtimeslice; - tsk->rlim[RLIMIT_CPU].rlim_cur = tsec->maxtimeslice; + tsk->signal->rlim[RLIMIT_CPU].rlim_max = tsec->maxtimeslice; + tsk->signal->rlim[RLIMIT_CPU].rlim_cur = tsec->maxtimeslice; } if (tsec->max_data) { - tsk->rlim[RLIMIT_CPU].rlim_max = tsec->max_data; - tsk->rlim[RLIMIT_CPU].rlim_cur = tsec->max_data; + tsk->signal->rlim[RLIMIT_CPU].rlim_max = tsec->max_data; + tsk->signal->rlim[RLIMIT_CPU].rlim_cur = tsec->max_data; } if (tsec->max_memlock) { - tsk->rlim[RLIMIT_CPU].rlim_max = tsec->max_memlock; - tsk->rlim[RLIMIT_CPU].rlim_cur = tsec->max_memlock; + tsk->signal->rlim[RLIMIT_CPU].rlim_max = tsec->max_memlock; + tsk->signal->rlim[RLIMIT_CPU].rlim_cur = tsec->max_memlock; } if (tsec->nice) set_user_nice(current, tsec->nice); _