Skip to content

[sanitizer] Fix sanitizing glob_t when flags contain GLOB_DOOFFS #166468

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+36 −6
Open

[sanitizer] Fix sanitizing glob_t when flags contain GLOB_DOOFFS #166468

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
21 changes: 15 additions & 6 deletions compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2468,13 +2468,19 @@ INTERCEPTOR(int, timespec_get, struct __sanitizer_timespec *ts, int base) {
#endif

#if SANITIZER_INTERCEPT_GLOB
static void unpoison_glob_t(void *ctx, __sanitizer_glob_t *pglob) {
static void unpoison_glob_t(void* ctx, int flags, __sanitizer_glob_t* pglob) {
SIZE_T offs = 0;
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, pglob, sizeof(*pglob));
# ifdef __SANITIZER_GLOB_DOOFFS
if (flags & __SANITIZER_GLOB_DOOFFS)
offs = pglob->gl_offs;
# endif
// +1 for NULL pointer at the end.
if (pglob->gl_pathv)
COMMON_INTERCEPTOR_WRITE_RANGE(
ctx, pglob->gl_pathv, (pglob->gl_pathc + 1) * sizeof(*pglob->gl_pathv));
for (SIZE_T i = 0; i < pglob->gl_pathc; ++i) {
ctx, pglob->gl_pathv,
(offs + pglob->gl_pathc + 1) * sizeof(*pglob->gl_pathv));
for (SIZE_T i = offs; i < offs + pglob->gl_pathc; ++i) {
char *p = pglob->gl_pathv[i];
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, p, internal_strlen(p) + 1);
}
Expand All @@ -2488,7 +2494,8 @@ INTERCEPTOR(int, glob, const char *pattern, int flags,
COMMON_INTERCEPTOR_ENTER(ctx, glob, pattern, flags, errfunc, pglob);
COMMON_INTERCEPTOR_READ_STRING(ctx, pattern, 0);
int res = REAL(glob)(pattern, flags, errfunc, pglob);
if ((!res || res == glob_nomatch) && pglob) unpoison_glob_t(ctx, pglob);
if ((!res || res == glob_nomatch) && pglob)
unpoison_glob_t(ctx, flags, pglob);
return res;
}
#else
Expand Down Expand Up @@ -2552,7 +2559,8 @@ INTERCEPTOR(int, glob, const char *pattern, int flags,
Swap(pglob->gl_stat, glob_copy.gl_stat);
}
pglob_copy = 0;
if ((!res || res == glob_nomatch) && pglob) unpoison_glob_t(ctx, pglob);
if ((!res || res == glob_nomatch) && pglob)
unpoison_glob_t(ctx, flags, pglob);
return res;
}
#endif // SANITIZER_SOLARIS
Expand Down Expand Up @@ -2588,7 +2596,8 @@ INTERCEPTOR(int, glob64, const char *pattern, int flags,
Swap(pglob->gl_stat, glob_copy.gl_stat);
}
pglob_copy = 0;
if ((!res || res == glob_nomatch) && pglob) unpoison_glob_t(ctx, pglob);
if ((!res || res == glob_nomatch) && pglob)
unpoison_glob_t(ctx, flags, pglob);
return res;
}
#define INIT_GLOB64 \
Expand Down
1 change: 1 addition & 0 deletions compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,6 +872,7 @@ struct __sanitizer_glob_t {
int (*gl_lstat)(const char *, void *);
int (*gl_stat)(const char *, void *);
};
# define __SANITIZER_GLOB_DOOFFS (1 << 3)
# endif // SANITIZER_LINUX

# if SANITIZER_LINUX
Expand Down
20 changes: 20 additions & 0 deletions compiler-rt/test/sanitizer_common/TestCases/Posix/glob.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// RUN: %clangxx -O0 -g %s -o %t && %run %t

#include <assert.h>
#include <glob.h>
#include <string.h>

int main(void) {
glob_t g;
memset(&g, 0, sizeof(g));

glob("*", 0, NULL, &g);
globfree(&g);

g.gl_offs = 1;
glob("*", GLOB_DOOFFS, NULL, &g);
assert(g.gl_pathv[0] == NULL);
globfree(&g);

return 0;
}
Loading