patch-1.3.89 linux/fs/binfmt_elf.c

• Lines: 46
• Date: Sun Apr 14 11:14:43 1996
• Orig file: v1.3.88/linux/fs/binfmt_elf.c
• Orig date: Tue Mar 12 08:22:32 1996

diff -u --recursive --new-file v1.3.88/linux/fs/binfmt_elf.c linux/fs/binfmt_elf.c
@@ -964,16 +964,17 @@
 	segs = 0;
 	size = 0;
 	for(vma = current->mm->mmap; vma != NULL; vma = vma->vm_next) {
-		int sz = vma->vm_end-vma->vm_start;
+		if (maydump(vma))
+		{
+			int sz = vma->vm_end-vma->vm_start;
 		
-		if (!maydump(vma))
-			continue;
-
-		if (size+sz > limit)
-			break;
+			if (size+sz >= limit)
+				break;
+			else
+				size += sz;
+		}
 		
 		segs++;
-		size += sz;
 	}
 #ifdef DEBUG
 	printk("elf_core_dump: %d segs taking %d bytes\n", segs, size);
@@ -1152,8 +1153,6 @@
 		struct elf_phdr phdr;
 		size_t sz;
 
-		if (!maydump(vma))
-			continue;
 		i++;
 
 		sz = vma->vm_end - vma->vm_start;
@@ -1162,9 +1161,9 @@
 		phdr.p_offset = offset;
 		phdr.p_vaddr = vma->vm_start;
 		phdr.p_paddr = 0;
-		phdr.p_filesz = sz;
+		phdr.p_filesz = maydump(vma) ? sz : 0;
 		phdr.p_memsz = sz;
-		offset += sz;
+		offset += phdr.p_filesz;
 		phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
 		if (vma->vm_flags & VM_WRITE) phdr.p_flags |= PF_W;
 		if (vma->vm_flags & VM_EXEC) phdr.p_flags |= PF_X;