Attachment 583709 Details for Bug 808342 – patch to fix some of these problems

[patch] patch to fix some of these problems

glibc-rh808342.patch (text/plain), 1.48 KB, created by Jeff Law on 2012-05-11 03:38:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Law

Created: 2012-05-11 03:38:38 UTC

Size: 1.48 KB

patch

obsolete

>commit 6a5ee1029b3966c5ae9adaaa881e255b2880f511
>Author: Ulrich Drepper <drepper@gmail.com>
>Date:   Sun Mar 6 00:01:50 2011 -0500
>
>    Fix loading first object along a path when tracing.
>
>diff --git a/elf/dl-load.c b/elf/dl-load.c
>index 1ad16a0..f866066 100644
>--- a/elf/dl-load.c
>+++ b/elf/dl-load.c
>@@ -2111,7 +2111,9 @@ _dl_map_object (struct link_map *loader, const char *name,
> 	    {
> #ifdef SHARED
> 	      // XXX Correct to unconditionally default to namespace 0?
>-	      l = loader ?: GL(dl_ns)[LM_ID_BASE]._ns_loaded;
>+	      l = (loader
>+		   ?: GL(dl_ns)[LM_ID_BASE]._ns_loaded
>+		   ?: &GL(dl_rtld_map));
> #else
> 	      l = loader;
> #endif
>diff -rup a/elf/dl-load.c b/elf/dl-load.c
>--- a/elf/dl-load.c	2012-02-03 10:59:58.917870716 -0700
>+++ b/elf/dl-load.c	2012-02-03 11:01:01.796580644 -0700
>@@ -1130,6 +1130,16 @@ _dl_map_object_from_fd (const char *name
> 		= N_("ELF load command address/offset not properly aligned");
> 	      goto call_lose;
> 	    }
>+	  if (__builtin_expect ((ph->p_offset + ph->p_filesz > st.st_size), 0))
>+	    {
>+	      /* If the segment requires zeroing of part of its last
>+		 page, we'll crash when accessing the unmapped page.
>+		 There's still a possibility of a race, if the shared
>+		 object is truncated between the fxstat above and the
>+		 memset below.  */
>+	      errstring = N_("ELF load command past end of file");
>+	      goto call_lose;
>+	    }
> 
> 	  c = &loadcmds[nloadcmds++];
> 	  c->mapstart = ph->p_vaddr & ~(GLRO(dl_pagesize) - 1);
>Only in b/elf: dl-load.c.orig

Actions: View | Diff

Attachments on bug 808342: 583709