From 83e5edd390eabe8f8e8e0d051f929b77a30c0767 Mon Sep 17 00:00:00 2001

From: Andreas Schwab <schwab@redhat.com>

Date: Fri, 18 Mar 2011 16:22:52 +0100

Subject: [PATCH] ldd: never run file directly

* elf/ldd.bash.in: Never run file directly.

---

 ChangeLog       |    4 ++++

 elf/ldd.bash.in |   14 +-------------

 2 files changed, 5 insertions(+), 13 deletions(-)

--- glibc-2.17-c758a686/elf/ldd.bash.in

+++ glibc-2.17-c758a686/elf/ldd.bash.in

@@ -166,18 +166,6 @@ warning: you do not have execution permission for" "\`$file'" >&2

       fi

     done

     case $ret in

-    0)

-      # If the program exits with exit code 5, it means the process has been

-      # invoked with __libc_enable_secure.  Fall back to running it through

-      # the dynamic linker.

-      try_trace "$file"

-      rc=$?

-      if [ $rc = 5 ]; then

-	try_trace "$RTLD" "$file"

-	rc=$?

-      fi

-      [ $rc = 0 ] || result=1

-      ;;

     1)

       # This can be a non-ELF binary or no binary at all.

       nonelf "$file" || {

@@ -185,7 +173,7 @@ warning: you do not have execution permission for" "\`$file'" >&2

 	result=1

       }

       ;;

-    2)

+    0|2)

       try_trace "$RTLD" "$file" || result=1

       ;;

     *)