Andreas Arens: Fix deadly mismerge of binfmt_elf DoS fix

Linux Kernel Mailing List <[email protected]> Sat, 26 Mar 2005 15:38:23 +0000

Newsgroups	gmane.linux.kernel.commits.2-4
Message-ID	<[email protected]>

ChangeSet 1.1487, 2005/03/26 12:38:23-03:00, [email protected]

	Andreas Arens: Fix deadly mismerge of binfmt_elf DoS fix 



 binfmt_elf.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


diff -Nru a/fs/binfmt_elf.c b/fs/binfmt_elf.c
--- a/fs/binfmt_elf.c	2005-03-26 13:03:13 -08:00
+++ b/fs/binfmt_elf.c	2005-03-26 13:03:13 -08:00
@@ -965,7 +965,7 @@
 	if (j != 1)
 		goto out_free_ph;
 
-	while (elf_phdata->p_type != PT_LOAD) 
+	while (eppnt->p_type != PT_LOAD) 
 		eppnt++;
 
 	/* Now use mmap to map the library into memory. */