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

["Mike Frysinger (vapier)" <vapier@gentoo.org>]

vapier      10/01/15 11:56:15

  Modified:             scanelf.c
  Log:
  check return value of lseek for errors

Revision  Changes    Path
1.218                pax-utils/scanelf.c

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/scanelf.c?rev=1.218&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/scanelf.c?rev=1.218&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/scanelf.c?r1=1.217&r2=1.218

Index: scanelf.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- scanelf.c	15 Jan 2010 10:29:17 -0000	1.217
+++ scanelf.c	15 Jan 2010 11:56:15 -0000	1.218
@@ -1,13 +1,13 @@
 /*
  * Copyright 2003-2007 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.217 2010/01/15 10:29:17 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.218 2010/01/15 11:56:15 vapier Exp $
  *
  * Copyright 2003-2007 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2004-2007 Mike Frysinger  - <vapier@gentoo.org>
  */
 
-static const char *rcsid = "$Id: scanelf.c,v 1.217 2010/01/15 10:29:17 vapier Exp $";
+static const char *rcsid = "$Id: scanelf.c,v 1.218 2010/01/15 11:56:15 vapier Exp $";
 const char * const argv0 = "scanelf";
 
 #include "paxinc.h"
@@ -1449,8 +1449,11 @@
 		return 1;
 
 	ar_buffer = mmap(0, len, PROT_READ | (fix_elf ? PROT_WRITE : 0), (fix_elf ? MAP_SHARED : MAP_PRIVATE), fd, 0);
-	while ((m=ar_next(ar)) != NULL) {
-		elf = readelf_buffer(m->name, ar_buffer+lseek(fd,0,SEEK_CUR), m->size);
+	while ((m = ar_next(ar)) != NULL) {
+		off_t cur_pos = lseek(fd, 0, SEEK_CUR);
+		if (cur_pos == -1)
+			errp("lseek() failed");
+		elf = readelf_buffer(m->name, ar_buffer + cur_pos, m->size);
 		if (elf) {
 			scanelf_elfobj(elf);
 			unreadelf(elf);