[gentoo-commits] gentoo-projects commit in pax-utils: paxelf.c

[Mike Frysinger (vapier)]

vapier      12/04/29 06:24:47

  Modified:             paxelf.c
  Log:
  drop invalid checking when looking up section headers -- e_shentsize applies to the section header struct itself, not the data region that it points to (sh_offset).  further, we only care about the sections name here, not the stuff it points to.  this fixes a bug where the last section in the ELF which happens to be smaller than e_shentsize cannot be looked up.

Revision  Changes    Path
1.72                 pax-utils/paxelf.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/paxelf.c?rev=1.72&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/paxelf.c?rev=1.72&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/paxelf.c?r1=1.71&r2=1.72

Index: paxelf.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/pax-utils/paxelf.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- paxelf.c	28 Apr 2012 05:14:26 -0000	1.71
+++ paxelf.c	29 Apr 2012 06:24:47 -0000	1.72
@@ -1,7 +1,7 @@
 /*
  * Copyright 2003-2007 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxelf.c,v 1.71 2012/04/28 05:14:26 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxelf.c,v 1.72 2012/04/29 06:24:47 vapier Exp $
  *
  * Copyright 2005-2007 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2007 Mike Frysinger  - <vapier@g.o>
@@ -706,7 +706,6 @@
 	if (shstrndx >= shnum) return NULL; \
 	strtbl = &(shdr[shstrndx]); \
 	for (i = 0; i < shnum; ++i) { \
-		if (EGET(shdr[i].sh_offset) >= elf->len - EGET(ehdr->e_shentsize)) continue; \
 		offset = EGET(strtbl->sh_offset) + EGET(shdr[i].sh_name); \
 		if (offset >= (Elf ## B ## _Off)elf->len) continue; \
 		shdr_name = elf->data + offset; \