remove duplicate rlim assignment in acct_stack_growth()
Subsystems (2)
PATCH 1/1 remove duplicate rlim assignment in acct_stack_growth()
remove duplicate rlim assignment in acct_stack_growth()
Signed-off-by Chris Wright <[email protected]>
===== mm/mmap.c 1.155 vs edited =====
mm/mmap.c +0 -1
@@ -1346,7 +1346,6 @@ static int acct_stack_growth(struct vm_astruct rlimit *rlim = current->signal->rlim;/* address space limit tests */ - rlim = current->signal->rlim;if (mm->total_vm + grow > rlim[RLIMIT_AS ].rlim_cur >>PAGE_SHIFT )return -ENOMEM ;
PATCH 1/1 acct_stack_growth nitpicks
- remove duplicate rlim assignment in acct_stack_growth()
- allow CAP_IPC_LOCK to override mlock rlimit during stack expansion as in all other cases
Signed-off-by Chris Wright <[email protected]>
===== mm/mmap.c 1.155 vs edited =====
mm/mmap.c +1 -2
@@ -1346,7 +1346,6 @@ static int acct_stack_growth(struct vm_astruct rlimit *rlim = current->signal->rlim;/* address space limit tests */ - rlim = current->signal->rlim;if (mm->total_vm + grow > rlim[RLIMIT_AS ].rlim_cur >>PAGE_SHIFT )return -ENOMEM ;
@@ -1360,7 +1359,7 @@ static int acct_stack_growth(struct vm_aunsigned long limit; locked = mm->locked_vm + grow; limit = rlim[RLIMIT_MEMLOCK ].rlim_cur >>PAGE_SHIFT ; -if (locked > limit) +if (locked > limit && !capable (CAP_IPC_LOCK ))return -ENOMEM ; }