Attachment 884276 Details for Bug 1085549 – bz1085549.diff

[patch] bz1085549.diff

bz1085549.diff (text/plain), 1.61 KB, created by Carlos O'Donell on 2014-04-08 22:49:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos O'Donell

Created: 2014-04-08 22:49:35 UTC

Size: 1.61 KB

patch

obsolete

>diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in
>index 4ff140d..6c1144c 100644
>--- a/elf/ldd.bash.in
>+++ b/elf/ldd.bash.in
>@@ -186,6 +186,9 @@ warning: you do not have execution permission for" "\`$file'" >&2
>     2)
>       try_trace "$RTLD" "$file" || result=1
>       ;;
>+    3)
>+      echo 'ldd:' ${RTLD} $" insufficient memory" >&2
>+      ;;
>     *)
>       echo 'ldd:' ${RTLD} $"exited with unknown exit code" "($ret)" >&2
>       exit 1
>diff --git a/elf/rtld.c b/elf/rtld.c
>index 9d121dc..90b8ab7 100644
>--- a/elf/rtld.c
>+++ b/elf/rtld.c
>@@ -44,6 +44,9 @@
> 
> #include <assert.h>
> 
>+/* Exit with a value of 3 if we ran out of memory while tracing.  */
>+#define EXIT_ENOMEM 3
>+
> /* Avoid PLT use for our local calls at startup.  */
> extern __typeof (__mempcpy) __mempcpy attribute_hidden;
> 
>@@ -1060,18 +1063,23 @@ of this helper program; chances are you did not intend to run this program.\n\
> 	{
> 	  const char *objname;
> 	  const char *err_str = NULL;
>+	  int errcode;
> 	  struct map_args args;
> 	  bool malloced;
> 
> 	  args.str = rtld_progname;
> 	  args.loader = NULL;
> 	  args.mode = __RTLD_OPENEXEC;
>-	  (void) _dl_catch_error (&objname, &err_str, &malloced, map_doit,
>-				  &args);
>+	  errcode = _dl_catch_error (&objname, &err_str, &malloced, map_doit,
>+				     &args);
> 	  if (__glibc_unlikely (err_str != NULL))
>-	    /* We don't free the returned string, the programs stops
>-	       anyway.  */
>-	    _exit (EXIT_FAILURE);
>+	    {
>+	      /* We don't free the returned string, the programs stops
>+	         anyway.  */
>+	      if (errcode == ENOMEM)
>+		_exit (EXIT_ENOMEM);
>+	      _exit (EXIT_FAILURE);
>+	    }
> 	}
>       else
> 	{

Actions: View | Diff

Attachments on bug 1085549: 884276