Skip to content

[NFC][sanitizer] Switch to gnu_get_libc_version #108724

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 5 commits into from
Sep 16, 2024
Merged

[NFC][sanitizer] Switch to gnu_get_libc_version #108724

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
15794f9
[𝘀𝗽𝗿] changes to main this commit is based on
vitalybuka Sep 15, 2024
e95aa02
[𝘀𝗽𝗿] initial version
vitalybuka Sep 15, 2024
6ed0063
[𝘀𝗽𝗿] changes introduced through rebase
clementval Sep 16, 2024
1977c14
rebase
vitalybuka Sep 16, 2024
120031b
rebase
vitalybuka Sep 16, 2024
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
18 changes: 8 additions & 10 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 @@ -40,6 +40,10 @@
# include <sys/resource.h>
# include <syslog.h>

# ifdef SANITIZER_GLIBC
# include <gnu/libc-version.h>
# endif

# if !defined(ElfW)
# define ElfW(type) Elf_##type
# endif
Expand Down Expand Up @@ -198,17 +202,11 @@ bool SetEnv(const char *name, const char *value) {

__attribute__((unused)) static bool GetLibcVersion(int *major, int *minor,
int *patch) {
# ifdef _CS_GNU_LIBC_VERSION
char buf[64];
uptr len = confstr(_CS_GNU_LIBC_VERSION, buf, sizeof(buf));
if (len >= sizeof(buf))
return false;
buf[len] = 0;
static const char kGLibC[] = "glibc ";
if (internal_strncmp(buf, kGLibC, sizeof(kGLibC) - 1) != 0)
return false;
const char *p = buf + sizeof(kGLibC) - 1;
# ifdef SANITIZER_GLIBC
const char *p = gnu_get_libc_version();
*major = internal_simple_strtoll(p, &p, 10);
// Caller does not expect anything else.
CHECK_EQ(*major, 2);
*minor = (*p == '.') ? internal_simple_strtoll(p + 1, &p, 10) : 0;
*patch = (*p == '.') ? internal_simple_strtoll(p + 1, &p, 10) : 0;
return true;
Expand Down
Loading