Attachment #45071 for bug #72452

Lines 342-347 int setup_arg_pages(struct linux_binprm Link Here

(-)linux-2.4.28/fs/exec.c (+7 lines)
342		342
343	down_write(&current->mm->mmap_sem);	343	down_write(&current->mm->mmap_sem);
344	{	344	{
		345	struct vm_area_struct *vma;
345	mpnt->vm_mm = current->mm;	346	mpnt->vm_mm = current->mm;
346	mpnt->vm_start = PAGE_MASK & (unsigned long) bprm->p;	347	mpnt->vm_start = PAGE_MASK & (unsigned long) bprm->p;
347	mpnt->vm_end = STACK_TOP;	348	mpnt->vm_end = STACK_TOP;
Lines 351-356 int setup_arg_pages(struct linux_binprm Link Here
351	mpnt->vm_pgoff = 0;	352	mpnt->vm_pgoff = 0;
352	mpnt->vm_file = NULL;	353	mpnt->vm_file = NULL;
353	mpnt->vm_private_data = (void *) 0;	354	mpnt->vm_private_data = (void *) 0;
		355	vma = find_vma(current->mm, mpnt->vm_start);
		356	if (vma) {
		357	up_write(&current->mm->mmap_sem);
		358	kmem_cache_free(vm_area_cachep, mpnt);
		359	return -ENOMEM;
		360	}
354	insert_vm_struct(current->mm, mpnt);	361	insert_vm_struct(current->mm, mpnt);
355	current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;	362	current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
356	}	363	}

Lines 39-51 static struct linux_binfmt aout_format = Link Here

(-)linux-2.4.28/fs/binfmt_aout.c (-5 / +14 lines)
39	NULL, THIS_MODULE, load_aout_binary, load_aout_library, aout_core_dump, PAGE_SIZE	39	NULL, THIS_MODULE, load_aout_binary, load_aout_library, aout_core_dump, PAGE_SIZE
40	};	40	};
41		41
42	static void set_brk(unsigned long start, unsigned long end)	42	#define BAD_ADDR(x) ((unsigned long)(x) >= TASK_SIZE)
		43
		44	static int set_brk(unsigned long start, unsigned long end)
43	{	45	{
44	start = PAGE_ALIGN(start);	46	start = PAGE_ALIGN(start);
45	end = PAGE_ALIGN(end);	47	end = PAGE_ALIGN(end);
46	if (end <= start)	48	if (end > start) {
47	return;	49	unsigned long addr = do_brk(start, end - start);
48	do_brk(start, end - start);	50	if (BAD_ADDR(addr))
		51	return addr;
		52	}
		53	return 0;
49	}	54	}
50		55
51	/*	56	/*
Lines 405-411 static int load_aout_binary(struct linux Link Here
405	beyond_if:	410	beyond_if:
406	set_binfmt(&aout_format);	411	set_binfmt(&aout_format);
407		412
408	set_brk(current->mm->start_brk, current->mm->brk);	413	retval = set_brk(current->mm->start_brk, current->mm->brk);
		414	if (retval < 0) {
		415	send_sig(SIGKILL, current, 0);
		416	return retval;
		417	}
409		418
410	retval = setup_arg_pages(bprm);	419	retval = setup_arg_pages(bprm);
411	if (retval < 0) {	420	if (retval < 0) {

Return to bug 72452