patch-1.3.24 linux/fs/binfmt_elf.c

Next file: linux/fs/exec.c
Previous file: linux/fs/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.23/linux/fs/binfmt_elf.c linux/fs/binfmt_elf.c
@@ -97,7 +97,7 @@
 
 	mpnt = (struct vm_area_struct *)kmalloc(sizeof(*mpnt), GFP_KERNEL);
 	if (mpnt) {
-		mpnt->vm_task = current;
+		mpnt->vm_mm = current->mm;
 		mpnt->vm_start = PAGE_MASK & (unsigned long) p;
 		mpnt->vm_end = TASK_SIZE;
 		mpnt->vm_page_prot = PAGE_COPY;
@@ -235,7 +235,7 @@
 	    
 	    error = do_mmap(file, 
 			    vaddr & 0xfffff000,
-			    eppnt->p_filesz + (vaddr & 0xfff),
+			    eppnt->p_filesz + (eppnt->p_vaddr & 0xfff),
 			    elf_prot,
 			    elf_type,
 			    eppnt->p_offset & 0xfffff000);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this