2005-01-11 00:58:15

by Chris Wright

Subject: [PATCH] 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 =====
--- 1.155/mm/mmap.c 2005-01-10 11:23:35 -08:00
+++ edited/mm/mmap.c 2005-01-10 16:29:06 -08:00
@@ -1346,7 +1346,6 @@ static int acct_stack_growth(struct vm_a
struct 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;

2005-01-11 03:52:52

by Chris Wright

Subject: [PATCH] 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 =====
--- 1.155/mm/mmap.c 2005-01-10 11:23:35 -08:00
+++ edited/mm/mmap.c 2005-01-10 19:34:05 -08:00
@@ -1346,7 +1346,6 @@ static int acct_stack_growth(struct vm_a
struct 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_a
unsigned 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;
}