git: a763331899b4 - stable/13 - ldd: use direct exec mode unconditionally
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 13 Oct 2022 04:46:08 UTC
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=a763331899b4bb5502382ce1d5dfc8a35d857e27
commit a763331899b4bb5502382ce1d5dfc8a35d857e27
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2022-09-21 13:55:44 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2022-10-13 04:46:01 +0000
ldd: use direct exec mode unconditionally
PR: 127276, 175339, 231926
(cherry picked from commit 9cabef3d146e9a844813b6bc8952d6cf2e9d45e5)
---
usr.bin/ldd/ldd.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c
index c16b6f5e8496..8897c8cbfbc2 100644
--- a/usr.bin/ldd/ldd.c
+++ b/usr.bin/ldd/ldd.c
@@ -233,18 +233,19 @@ main(int argc, char *argv[])
}
break;
case 0:
+ rtld = _PATH_RTLD;
+#if __ELF_WORD_SIZE > 32 && defined(ELF32_SUPPORTED)
+ if (type == TYPE_ELF32)
+ rtld = _COMPAT32_PATH_RTLD;
+#endif
if (is_shlib == 0) {
- execl(*argv, *argv, (char *)NULL);
+ execl(rtld, rtld, "--",
+ *argv, (char *)NULL);
warn("%s", *argv);
} else if (fmt1 == NULL && fmt2 == NULL && !aflag) {
dlopen(*argv, RTLD_TRACE);
warnx("%s: %s", *argv, dlerror());
} else {
- rtld = _PATH_RTLD;
-#if __ELF_WORD_SIZE > 32 && defined(ELF32_SUPPORTED)
- if (type == TYPE_ELF32)
- rtld = _COMPAT32_PATH_RTLD;
-#endif
execl(rtld, rtld, "-d", "--",
*argv, (char *)NULL);
}