Fix ELF output with overlapping sections

@@ -64,6 +64,43 @@ paddr_to_offset(struct DumpInfo *info, u
 	return offset;
 }
 
+/**
+ * Sames as paddr_to_offset() but makes sure that the complete range is covered
+ * by the segment
+ */
+off_t
+paddr_to_offset_range(struct DumpInfo *info, unsigned long long paddr, unsigned long len)
+{
+	int i;
+	off_t offset;
+	struct pt_load_segment *pls;
+
+	for (i = offset = 0; i < info->num_load_memory; i++) {
+		pls = &info->pt_load_segments[i];
+		if ((paddr >= pls->phys_start)
+		    && (paddr <= pls->phys_end)) {
+
+			/* check the length and also consider adjacent sections */
+			unsigned long long end = pls->phys_end;
+			int j = i+1;
+
+			while (j < info->num_load_memory &&
+					(info->pt_load_segments[j-1].phys_end
+					 == info->pt_load_segments[j].phys_start)) {
+				end = info->pt_load_segments[j].phys_end;
+				j++;
+			}
+
+			if (paddr + len <= end) {
+				offset = (off_t)(paddr - pls->phys_start) +
+					pls->file_offset;
+				break;
+			}
+		}
+	}
+	return offset;
+}
+
 unsigned long long
 vaddr_to_paddr(struct DumpInfo *info, unsigned long long vaddr)
 {

@@ -3777,6 +3814,7 @@ write_elf_pages(struct DumpInfo *info)
 			pfn_end++;
 
 		for (pfn = pfn_start; pfn < pfn_end; pfn++) {
+
 			if (!is_dumpable(&bitmap2, pfn)) {
 				num_excluded++;
 				if ((pfn == pfn_end - 1) && frac_tail)

@@ -3934,13 +3972,19 @@ write_elf_pages(struct DumpInfo *info)
 				goto out;
 		}
 
+		if (info->flag_elf64) /* ELF64 */
+			bufsz_remain = load64.p_filesz;
+		else                  /* ELF32 */
+			bufsz_remain = load32.p_filesz;
+
 		/*
 		 * Write a PT_LOAD segment.
 		 */
-		off_memory = paddr_to_offset(info, paddr);
+		off_memory = paddr_to_offset_range(info, paddr, bufsz_remain);
 		if (!off_memory) {
 			ERRMSG("Can't convert physaddr(%llx) to a offset.\n",
 			    paddr);
+			printf("paddr = 0x%llx, bufsz_remain=%lld\n", paddr, bufsz_remain);
 			goto out;
 		}
 		if (lseek(info->fd_memory, off_memory, SEEK_SET)

@@ -3949,10 +3993,6 @@ write_elf_pages(struct DumpInfo *info)
 			    info->name_memory, strerror(errno));
 			goto out;
 		}
-		if (info->flag_elf64) /* ELF64 */
-			bufsz_remain = load64.p_filesz;
-		else                  /* ELF32 */
-			bufsz_remain = load32.p_filesz;
 
 		while (bufsz_remain > 0) {
 			if ((num_dumped % per) == 0)

diff -puN backup/v1.1.3/makedumpfile.c a/makedumpfile.c
@@ -2561,6 +2561,33 @@ out:
 	return ret;
 }
 
+/*
+ * Sames as paddr_to_offset() but makes sure that the specified offset (hint)
+ * in the segment.
+ */
+off_t
+paddr_to_offset2(struct DumpInfo *info, unsigned long long paddr, off_t hint)
+{
+	int i;
+	off_t offset;
+	unsigned long long len;
+	struct pt_load_segment *pls;
+
+	for (i = offset = 0; i < info->num_load_memory; i++) {
+		pls = &info->pt_load_segments[i];
+		len = pls->phys_end - pls->phys_start;
+		if ((paddr >= pls->phys_start)
+		    && (paddr < pls->phys_end)
+		    && (hint >= pls->file_offset)
+		    && (hint < pls->file_offset + len)) {
+			offset = (off_t)(paddr - pls->phys_start) +
+				pls->file_offset;
+				break;
+		}
+	}
+	return offset;
+}
+
 unsigned long long
 page_to_pfn(struct DumpInfo *info, unsigned long page)
 {

@@ -3462,7 +3489,6 @@ write_elf_pages(struct DumpInfo *info)
 
 	off_seg_load  = info->offset_load_dumpfile;
 	cd_seg.offset = info->offset_load_dumpfile;
-	off_memory = 0;
 
 	if (info->flag_elf64) { /* ELF64 */
 		cd_hdr.offset = sizeof(Elf64_Ehdr) + sizeof(Elf64_Phdr);

@@ -3488,7 +3514,7 @@ write_elf_pages(struct DumpInfo *info)
 			}
 			if (load64.p_type != PT_LOAD)
 				continue;
-
+			off_memory= load64.p_offset;
 			paddr     = load64.p_paddr;
 			pfn_start = load64.p_paddr / page_size;
 			pfn_end   = (load64.p_paddr+ load64.p_memsz)/page_size;

@@ -3501,6 +3527,7 @@ write_elf_pages(struct DumpInfo *info)
 			}
 			if (load32.p_type != PT_LOAD)
 				continue;
+			off_memory= load32.p_offset;
 			paddr     = load32.p_paddr;
 			pfn_start = load32.p_paddr / page_size;
 			pfn_end   = (load32.p_paddr+ load32.p_memsz)/page_size;

@@ -3588,7 +3615,7 @@ write_elf_pages(struct DumpInfo *info)
 			/*
 			 * Write a PT_LOAD segment.
 			 */
-			off_memory = paddr_to_offset(info, paddr);
+			off_memory = paddr_to_offset2(info, paddr, off_memory);
 			if (!off_memory) {
 				ERRMSG("Can't convert physaddr(%llx) to a offset.\n",
 				    paddr);

@@ -3680,7 +3707,7 @@ write_elf_pages(struct DumpInfo *info)
 		/*
 		 * Write a PT_LOAD segment.
 		 */
-		off_memory = paddr_to_offset(info, paddr);
+		off_memory = paddr_to_offset2(info, paddr, off_memory);
 		if (!off_memory) {
 			ERRMSG("Can't convert physaddr(%llx) to a offset.\n",
 			    paddr);