Attachment 26580 Details for Bug 63576

[patch] file-4.07-elfmagic.patch

file-4.07-elfmagic.patch (text/plain), 2.00 KB, created by Thomas Biege on 2004-11-30 19:42:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Biege

Created: 2004-11-30 19:42:27 UTC

Size: 2.00 KB

patch

obsolete

>>           Jakub Bogusz <qboosh@pld-linux.org>
>>
>> 2004-07-24 16:33  Christos Zoulas  <christos@zoulas.com>
>>
>>         * errors reading elf magic Jakub Bogusz <qboosh@pld-linux.org>
>
>Original version for file 4.07:
>http://cvs.pld-linux.org/cgi-bin/cvsweb/SOURCES/Attic/file-readelf-fix.patch?rev=1.1
>and updated for file 4.08:
>http://cvs.pld-linux.org/cgi-bin/cvsweb/SOURCES/Attic/file-readelf-fix.patch?rev=1.2
>
>--- file-4.07/src/readelf.c.orig	2003-11-18 20:42:33.000000000 +0100
>+++ file-4.07/src/readelf.c	2004-03-19 22:54:46.236372725 +0100
>@@ -147,6 +147,9 @@
> 			    getu32(swap, ph32.p_align) : 4) \
> 			 : (off_t) (ph64.p_align ?	\
> 			    getu64(swap, ph64.p_align) : 4)))
>+#define ph_filesz	(class == ELFCLASS32		\
>+			 ? getu32(swap, ph32.p_filesz)	\
>+			 : getu64(swap, ph64.p_filesz))
> #define nh_size		(class == ELFCLASS32		\
> 			 ? sizeof nh32			\
> 			 : sizeof nh64)
>@@ -249,7 +252,7 @@
> 			file_badseek(ms);
> 			return -1;
> 		}
>-		bufsize = read(fd, nbuf, BUFSIZ);
>+		bufsize = read(fd, nbuf, ((ph_filesz < BUFSIZ) ? ph_filesz : BUFSIZ));
> 		if (bufsize == -1) {
> 			file_badread(ms);
> 			return -1;
>@@ -297,7 +297,7 @@
> 	noff = offset;
> 	doff = ELF_ALIGN(offset + nh_namesz);
> 
>-	if (offset + nh_namesz >= size) {
>+	if (doff > size) {
> 		/*
> 		 * We're past the end of the buffer.
> 		 */
>@@ -305,7 +305,7 @@
> 	}
> 
> 	offset = ELF_ALIGN(doff + nh_descsz);
>-	if (offset + nh_descsz >= size)
>+	if (offset > size)
> 		return offset;
> 
> 	if (nh_namesz == 4 && strcmp((char *)&nbuf[noff], "GNU") == 0 &&
>@@ -622,7 +625,8 @@
> 				file_badseek(ms);
> 				return -1;
> 			}
>-			bufsize = read(fd, nbuf, sizeof(nbuf));
>+			bufsize = read(fd, nbuf,
>+				((ph_filesz < sizeof(nbuf)) ? ph_filesz : sizeof(nbuf)));
> 			if (bufsize == -1) {
> 				file_badread(ms);
> 				return -1;
>@@ -634,7 +638,7 @@
> 				offset = donote(ms, nbuf, offset,
> 				    (size_t)bufsize, class, swap, ph_align);
> 			}
>-			if (lseek(fd, savedoffset + offset, SEEK_SET)
>+			if (lseek(fd, savedoffset, SEEK_SET)
> 			    == (off_t)-1) {
> 				file_badseek(ms);
> 				return -1;
>

Actions: View | Diff

Attachments on bug 63576: 26516 | 26576 | 26577 | 26580 | 26581 | 26582 | 26583 | 26584 | 26602 | 26612 | 26613 | 26614 | 26615