ldd: never run file directly

diff --git a/ChangeLog b/ChangeLog
index db3e4b3a92363156084ae2a334957e51861cb7ed..7188d1ec461424ac1980813c70b3bd289092f547 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-08-16  Andreas Schwab  <schwab@suse.de>
+
+       * elf/ldd.bash.in: Never run file directly.
+
 2017-08-15  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #21955]

diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in
index 7dd1fccf249c5c333e2c45de5779d541d68f84fc..686785e23581cc1f8f5396018241784c01d32171 100644 (file)
--- a/elf/ldd.bash.in
+++ b/elf/ldd.bash.in
@@ -164,18 +164,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" || {
@@ -183,7 +171,7 @@ warning: you do not have execution permission for" "\`$file'" >&2
        result=1
       }
       ;;
-    2)
+    0|2)
       try_trace "$RTLD" "$file" || result=1
       ;;
     *)