--- fs/exec.c

+++ fs/exec.c

@@ -159,7 +159,22 @@ out:

#ifdef CONFIG_MMU

-static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,

+void acct_arg_size(struct linux_binprm *bprm, unsigned long pages)

+{

+ struct mm_struct *mm = current->mm;

+ long diff = (long)(pages - bprm->vma_pages);

+

+ if (!mm || !diff)

+ return;

+

+ bprm->vma_pages = pages;

+

+ down_write(&mm->mmap_sem);

+ mm->total_vm += diff;

+ up_write(&mm->mmap_sem);

+}

+

+struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,

int write)

{

struct page *page;

@@ -181,6 +196,8 @@ static struct page *get_arg_page(struct

unsigned long size = bprm->vma->vm_end - bprm->vma->vm_start;

struct rlimit *rlim;

+ acct_arg_size(bprm, size / PAGE_SIZE);

+

/*

* We've historically supported up to 32 pages (ARG_MAX)

* of argument strings even with small stacks

@@ -274,7 +291,11 @@ static bool valid_arg_len(struct linux_b

#else

-static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,

+void acct_arg_size(struct linux_binprm *bprm, unsigned long pages)

+{

+}

+

+struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,

int write)

{

struct page *page;

@@ -981,6 +1002,7 @@ int flush_old_exec(struct linux_binprm *

/*

* Release all of the old mmap stuff

*/

+ acct_arg_size(bprm, 0);

retval = exec_mmap(bprm->mm);

if (retval)

goto out;

@@ -1408,8 +1430,10 @@ int do_execve(char * filename,

return retval;

out:

- if (bprm->mm)

- mmput (bprm->mm);

+ if (bprm->mm) {

+ acct_arg_size(bprm, 0);

+ mmput(bprm->mm);

+ }

out_file:

if (bprm->file) {