Attachment 158657 Details for Bug 247261 – Patch which resolves the issue

Patch which resolves the issue

binfmt_elf-segfault.patch (text/x-patch), 1.19 KB, created by Ian Campbell on 2007-07-06 13:33:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Campbell

Created: 2007-07-06 13:33:44 UTC

Size: 1.19 KB

patch

obsolete

>diff -r 8927aa013e29 fs/binfmt_elf.c
>--- a/fs/binfmt_elf.c	Tue Jun 26 12:01:58 2007 +0100
>+++ b/fs/binfmt_elf.c	Wed Jun 27 10:15:32 2007 +0100
>@@ -348,8 +351,9 @@ static inline unsigned long total_mappin
>    is only provided so that we can read a.out libraries that have
>    an ELF header */
> 
> static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
> 		struct file *interpreter, unsigned long *interp_map_addr,
>+	        unsigned long *interp_load_addr,
> 		unsigned long no_base)
> {
> 	struct elf_phdr *elf_phdata;
>@@ -491,7 +513,8 @@ static unsigned long load_elf_interp(str
> 			goto out_close;
> 	}
> 
>-	error = load_addr;
>+	*interp_load_addr = load_addr;
>+	error = load_addr + interp_elf_ex->e_entry;
> 
> out_close:
> 	kfree(elf_phdata);
>@@ -1011,12 +1034,8 @@ static int load_elf_binary(struct linux_
> 			elf_entry = load_elf_interp(&loc->interp_elf_ex,
> 						    interpreter,
> 						    &interp_map_addr,
>+						    &interp_load_addr,
> 						    load_bias);
>-			if (!BAD_ADDR(elf_entry)) {
>-				/* load_elf_interp() returns relocation adjustment */
>-				interp_load_addr = elf_entry;
>-				elf_entry += loc->interp_elf_ex.e_entry;
>-			}
> 		}
> 		if (BAD_ADDR(elf_entry)) {
> 			force_sig(SIGSEGV, current);

Actions: View

Attachments on bug 247261: 158657