fb633ea
From 83e5edd390eabe8f8e8e0d051f929b77a30c0767 Mon Sep 17 00:00:00 2001
fb633ea
From: Andreas Schwab <schwab@redhat.com>
fb633ea
Date: Fri, 18 Mar 2011 16:22:52 +0100
fb633ea
Subject: [PATCH] ldd: never run file directly
fb633ea
fb633ea
* elf/ldd.bash.in: Never run file directly.
fb633ea
fb633ea
---
fb633ea
 ChangeLog       |    4 ++++
fb633ea
 elf/ldd.bash.in |   14 +-------------
fb633ea
 2 files changed, 5 insertions(+), 13 deletions(-)
fb633ea
fb633ea
--- a/elf/ldd.bash.in
fb633ea
+++ b/elf/ldd.bash.in
fb633ea
@@ -166,18 +166,6 @@ warning: you do not have execution permission for" "\`$file'" >&2
fb633ea
       fi
fb633ea
     done
fb633ea
     case $ret in
fb633ea
-    0)
fb633ea
-      # If the program exits with exit code 5, it means the process has been
fb633ea
-      # invoked with __libc_enable_secure.  Fall back to running it through
fb633ea
-      # the dynamic linker.
fb633ea
-      try_trace "$file"
fb633ea
-      rc=$?
fb633ea
-      if [ $rc = 5 ]; then
fb633ea
-	try_trace "$RTLD" "$file"
fb633ea
-	rc=$?
fb633ea
-      fi
fb633ea
-      [ $rc = 0 ] || result=1
fb633ea
-      ;;
fb633ea
     1)
fb633ea
       # This can be a non-ELF binary or no binary at all.
fb633ea
       nonelf "$file" || {
fb633ea
@@ -185,7 +173,7 @@ warning: you do not have execution permission for" "\`$file'" >&2
fb633ea
 	result=1
fb633ea
       }
fb633ea
       ;;
fb633ea
-    2)
fb633ea
+    0|2)
fb633ea
       try_trace "$RTLD" "$file" || result=1
fb633ea
       ;;
fb633ea
     *)