Skip to content

Commit

Permalink
[sanitizer] remove FreeBSD PS_STRINGS fallback
Browse files Browse the repository at this point in the history
The PS_STRINGS constant can easily be incorrect with mismatched
kernel/userland - e.g. when building i386 sanitizers on FreeBSD/amd64
with -m32. The kern.ps_strings sysctl was introduced over 20 years ago
as the supported way to fetch the environment and argument string
addresses from the kernel, so the fallback is never used.

Differential Revision:	http://reviews.llvm.org/D19027

llvm-svn: 266305
  • Loading branch information
emaste committed Apr 14, 2016
1 parent d502f47 commit fe2b706
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
Expand Up @@ -490,12 +490,13 @@ static void GetArgsAndEnv(char ***argv, char ***envp) {
#else
// On FreeBSD, retrieving the argument and environment arrays is done via the
// kern.ps_strings sysctl, which returns a pointer to a structure containing
// this information. If the sysctl is not available, a "hardcoded" address,
// PS_STRINGS, must be used instead. See also <sys/exec.h>.
// this information. See also <sys/exec.h>.
ps_strings *pss;
size_t sz = sizeof(pss);
if (sysctlbyname("kern.ps_strings", &pss, &sz, NULL, 0) == -1)
pss = (ps_strings*)PS_STRINGS;
if (sysctlbyname("kern.ps_strings", &pss, &sz, NULL, 0) == -1) {
Printf("sysctl kern.ps_strings failed\n");
Die();
}
*argv = pss->ps_argvstr;
*envp = pss->ps_envstr;
#endif
Expand Down

0 comments on commit fe2b706

Please sign in to comment.