diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | elf/ldd.bash.in | 14 |
2 files changed, 5 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog index db3e4b3a92..7188d1ec46 100644 --- 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 7dd1fccf24..686785e235 100644 --- 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 ;; *) |