Messages in this thread Patch in this message | | | Date | Tue, 12 Aug 2003 22:07:21 +0100 | From | Matthew Wilcox <> | Subject | [PATCH] Better argument size tracking in fs/exec.c |
| |
Introduce a new variable "arg_size" and set it appropriately in each arm of the CONFIG_STACK_GROWSUP. This patch fixes a bug for PA-RISC and makes the code cleaner for everyone.
diff -urpNX dontdiff linus-2.6/fs/exec.c parisc-2.6/fs/exec.c --- linus-2.6/fs/exec.c Tue Aug 12 13:11:16 2003 +++ parisc-2.6/fs/exec.c Tue Aug 12 13:29:42 2003 @@ -341,6 +341,7 @@ int setup_arg_pages(struct linux_binprm struct vm_area_struct *mpnt; struct mm_struct *mm = current->mm; int i; + long arg_size; #ifdef CONFIG_STACK_GROWSUP /* Move the argument and environment strings to the bottom of the @@ -375,6 +376,7 @@ int setup_arg_pages(struct linux_binprm bprm->p = PAGE_SIZE * i - offset; stack_base = STACK_TOP - current->rlim[RLIMIT_STACK].rlim_max; mm->arg_start = stack_base; + arg_size = i << PAGE_SHIFT; /* zero pages that were copied above */ while (i < MAX_ARG_PAGES) @@ -382,6 +390,7 @@ int setup_arg_pages(struct linux_binprm #else stack_base = STACK_TOP - MAX_ARG_PAGES * PAGE_SIZE; mm->arg_start = bprm->p + stack_base; + arg_size = STACK_TOP - (PAGE_MASK & (unsigned long) mm->arg_start); #endif bprm->p += stack_base; @@ -393,7 +402,7 @@ int setup_arg_pages(struct linux_binprm if (!mpnt) return -ENOMEM; - if (security_vm_enough_memory((STACK_TOP - (PAGE_MASK & (unsigned long) bprm->p))>>PAGE_SHIFT)) { + if (security_vm_enough_memory(arg_size >> PAGE_SHIFT)) { kmem_cache_free(vm_area_cachep, mpnt); return -ENOMEM; } -- "It's not Hollywood. War is real, war is primarily not about defeat or victory, it is about death. I've seen thousands and thousands of dead bodies. Do you think I want to have an academic debate on this subject?" -- Robert Fisk - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |