Attachment 193346 Details for Bug 227552 – Fix from Kai Wang (kaiw@) for readelf

[patch] Fix from Kai Wang (kaiw@) for readelf

tls2.patch (text/plain), 1.10 KB, created by Phil Shafer on 2018-05-13 05:39:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Phil Shafer

Created: 2018-05-13 05:39:05 UTC

Size: 1.10 KB

patch

obsolete

>commit d8db417997ce4cfe8368208c0a919fe4b6bd6635
>Author: Kai Wang <kaiwang27@gmail.com>
>Date:   Sun May 13 03:44:02 2018 +0200
>
>    Fixed multiple errors in "Section to Segment mapping".
>
>diff --git a/readelf/readelf.c b/readelf/readelf.c
>index 63be1ef..cd5c006 100644
>--- a/readelf/readelf.c
>+++ b/readelf/readelf.c
>@@ -2372,11 +2372,22 @@ dump_phdr(struct readelf *re)
> 		}
> 		printf("   %2.2d     ", i);
> 		/* skip NULL section. */
>-		for (j = 1; (size_t)j < re->shnum; j++)
>-			if (re->sl[j].addr >= phdr.p_vaddr &&
>-			    re->sl[j].addr + re->sl[j].sz <=
>+		for (j = 1; (size_t)j < re->shnum; j++) {
>+			if (re->sl[j].off < phdr.p_offset)
>+				continue;
>+			if (re->sl[j].off + re->sl[j].sz >
>+			    phdr.p_offset + phdr.p_filesz &&
>+			    re->sl[j].type != SHT_NOBITS)
>+				continue;
>+			if (re->sl[j].addr < phdr.p_vaddr ||
>+			    re->sl[j].addr + re->sl[j].sz >
> 			    phdr.p_vaddr + phdr.p_memsz)
>-				printf("%s ", re->sl[j].name);
>+				continue;
>+			if (phdr.p_type == PT_TLS &&
>+			    (re->sl[j].flags & SHF_TLS) == 0)
>+				continue;
>+			printf("%s ", re->sl[j].name);
>+		}
> 		printf("\n");
> 	}
> #undef	PH_HDR

Actions: View | Diff

Attachments on bug 227552: 193345 | 193346