Skip to content

[compiler-rt] simplifying ::ReExec for freebsd. #79711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 16, 2024
+15 −8
Merged

[compiler-rt] simplifying ::ReExec for freebsd. #79711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions compiler-rt/lib/sanitizer_common/sanitizer_getauxval.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,20 @@ static inline decltype(AuxInfo::a_v) getauxval(decltype(AuxInfo::a_type) type) {
return 0;
}

#elif SANITIZER_FREEBSD
# include <sys/auxv.h>

# define SANITIZER_USE_GETAUXVAL 1
# define AT_EXECFN AT_EXECPATH

static inline unsigned long getauxval(unsigned long type) {
unsigned long buf = 0ul;

if (elf_aux_info(static_cast<int>(type), &buf, sizeof(buf)))
return 0ul;
return buf;
}

#endif

#endif // SANITIZER_GETAUXVAL_H
9 changes: 1 addition & 8 deletions compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,14 +934,7 @@ u64 MonotonicNanoTime() {
void ReExec() {
const char *pathname = "/proc/self/exe";

# if SANITIZER_FREEBSD
for (const auto *aux = __elf_aux_vector; aux->a_type != AT_NULL; aux++) {
if (aux->a_type == AT_EXECPATH) {
pathname = static_cast<const char *>(aux->a_un.a_ptr);
break;
}
}
# elif SANITIZER_NETBSD
# if SANITIZER_NETBSD
static const int name[] = {
CTL_KERN,
KERN_PROC_ARGS,
Expand Down