forked from pool/glibc
52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
|
Never try to execute the file in ldd
|
||
|
|
|
||
|
|
Executing a random file is never a good idea. Treat all arguments as if
|
||
|
|
they are invoked with __libc_enable_secure, and run them through the known
|
||
|
|
good dynamic linker.
|
||
|
|
|
||
|
|
* elf/ldd.bash.in: Always run through the dynamic linker, even if
|
||
|
|
the file has its own interpreter. Remove unneeded executable
|
||
|
|
check.
|
||
|
|
|
||
|
|
Index: glibc-2.19/elf/ldd.bash.in
|
||
|
|
===================================================================
|
||
|
|
--- glibc-2.19.orig/elf/ldd.bash.in
|
||
|
|
+++ glibc-2.19/elf/ldd.bash.in
|
||
|
|
@@ -150,8 +150,6 @@ for file do
|
||
|
|
echo "ldd: ${file}:" $"not regular file" >&2
|
||
|
|
result=1
|
||
|
|
elif test -r "$file"; then
|
||
|
|
- test -x "$file" || echo 'ldd:' $"\
|
||
|
|
-warning: you do not have execution permission for" "\`$file'" >&2
|
||
|
|
RTLD=
|
||
|
|
ret=1
|
||
|
|
for rtld in ${RTLDLIST}; do
|
||
|
|
@@ -164,18 +162,6 @@ warning: you do not have execution permi
|
||
|
|
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 +169,7 @@ warning: you do not have execution permi
|
||
|
|
result=1
|
||
|
|
}
|
||
|
|
;;
|
||
|
|
- 2)
|
||
|
|
+ [02])
|
||
|
|
try_trace "$RTLD" "$file" || result=1
|
||
|
|
;;
|
||
|
|
*)
|