This is an archive of the discontinued LLVM Phabricator instance.

Differential D126851

[MSAN] add dn_expand intercept.
ClosedPublic

Authored by kda on Jun 1 2022, 8:44 PM.

Details

Reviewers
vitalybuka
Commits
rG1a729bce8617: [MSAN] add dn_expand intercept.
Summary

This interceptor only addresses writes to inputs. Reads of inputs are not checked.

Diff Detail

Event Timeline

kda created this revision.Jun 1 2022, 8:44 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 1 2022, 8:44 PM
Herald added a subscriber: Enna1. · View Herald Transcript
kda requested review of this revision.Jun 1 2022, 8:44 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 1 2022, 8:44 PM
Herald added a subscriber: Restricted Project. · View Herald Transcript
kda abandoned this revision.Jun 1 2022, 8:45 PM
Harbormaster completed remote builds in B167436: Diff 433639.Jun 1 2022, 8:45 PM
kda updated this revision to Diff 433640.Jun 1 2022, 8:47 PM

remove commented out code

kda abandoned this revision.Jun 1 2022, 8:47 PM
Harbormaster completed remote builds in B167437: Diff 433640.Jun 1 2022, 8:47 PM
kda updated this revision to Diff 433642.Jun 1 2022, 8:50 PM

remove commented out code

kda retitled this revision from remove commented out code to [MSAN] add dn_expand intercept..Jun 1 2022, 8:52 PM
kda added a reviewer: vitalybuka.
Harbormaster completed remote builds in B167439: Diff 433642.Jun 1 2022, 9:09 PM
vitalybuka added inline comments.Jun 2 2022, 10:25 AM
compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
2531 ↗(On Diff #433642)

int space?

2534 ↗(On Diff #433642)

maybe we should drop COMMON_INTERCEPTOR_READ_RANGE, and just keep only WRITE?

eugenis added a subscriber: eugenis.Jun 2 2022, 1:06 PM

We should also add -lresolv to tools::linkSanitizerRuntimeDeps if we are now intercepting functions from there.
Libresolv is part of libc.so on android.

kda edited the summary of this revision. (Show Details)Jun 2 2022, 2:17 PM
kda updated this revision to Diff 433887.Jun 2 2022, 2:18 PM
kda marked 2 inline comments as done.

eliminate read checking

Harbormaster completed remote builds in B167618: Diff 433887.Jun 2 2022, 2:41 PM
vitalybuka accepted this revision.Jun 2 2022, 4:05 PM
This revision is now accepted and ready to land.Jun 2 2022, 4:05 PM
kda updated this revision to Diff 434050.Jun 3 2022, 9:49 AM

eliminate read checking

This revision was landed with ongoing or failed builds.Jun 3 2022, 9:49 AM
Closed by commit rG1a729bce8617: [MSAN] add dn_expand intercept. (authored by kda). · Explain Why
This revision was automatically updated to reflect the committed changes.
kda added a commit: rG1a729bce8617: [MSAN] add dn_expand intercept..
Harbormaster completed remote builds in B167733: Diff 434050.Jun 3 2022, 10:08 AM
kda added a comment.Jun 3 2022, 11:13 AM

I am aware of this breakage: https://lab.llvm.org/buildbot/#/builders/77/builds/18273

I will push a fix shortly.

browneee added a subscriber: browneee.Jun 3 2022, 11:13 AM
In D126851#3556476, @kda wrote:

I am aware of this breakage: https://lab.llvm.org/buildbot/#/builders/77/builds/18273

I will push a fix shortly.

Thanks!

kda added a comment.Jun 3 2022, 11:26 AM

committed: 21f2ac9a2f95

kda mentioned this in D127145: [Driver] add -lresolv for all but Android..Jun 6 2022, 1:24 PM
kda added a child revision: D126981: [MSAN] Exclude dn_expand test from Android..Jun 6 2022, 3:47 PM
kda mentioned this in rG6dce56b2a308: [Driver] add -lresolv for all but Android..Jun 6 2022, 3:50 PM
vitalybuka mentioned this in rGba4435eb6233: [msan] Fix dn_comp interceptor after D126851.Jul 7 2022, 9:27 AM

Revision Contents

PathSize
compiler-rt/
test/
msan/
Linux/
16 lines
sanitizer_common/
TestCases/
Linux/
42 lines

Diff 433640

compiler-rt/test/msan/Linux/dn_expand.cpp

// RUN: %clangxx_msan -O0 %s -o %t -lresolv && %run %t // RUN: %clangxx_msan -O0 %s -o %t -lresolv && %run %t
// RUN: not %run %t READ 2>&1 | FileCheck %s --check-prefix=READ // RUN: not %run %t READ 2>&1 | FileCheck %s --check-prefix=READ
#include <assert.h> #include <assert.h>
#include <resolv.h> #include <resolv.h>
#include <string.h> #include <string.h>
#include <sanitizer/msan_interface.h> #include <sanitizer/msan_interface.h>
void testRead() { void testRead() {
const int INPUT_LEN = 24; const int INPUT_LEN = 24;
char unsigned input[INPUT_LEN]; char unsigned input[INPUT_LEN];
char output[1024]; char output[1024];
dn_expand(input, input + sizeof(input), input + 23, output, dn_expand(input, input + sizeof(input), input + 23, output, sizeof(output));
sizeof(output));
// READ: Uninitialized bytes in __interceptor___dn_expand // READ: Uninitialized bytes in __interceptor___dn_expand
} }
void testWrite() { void testWrite() {
char unsigned input[] = { char unsigned input[] = {0xff, 0xc5, 0xf7, 0xff, 0x00, 0x00, 0xff, 0x0a, 0x00,
0xff, 0xc5, 0xf7, 0xff, 0x00, 0x00, 0xff, 0x0a, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00,
0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x10, 0x01, 0x05, 0x00, 0x01, 0x0a, 0x10, 0x01, 0x05, 0x00, 0x01, 0x0a, 0x67, 0x6f, 0x6f,
0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x00 0x67, 0x6c, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x00};
};
char output[1024]; char output[1024];
int res = dn_expand(input, input + sizeof(input), input + 23, output, int res = dn_expand(input, input + sizeof(input), input + 23, output,
sizeof(output)); sizeof(output));
assert(res >= 0); assert(res >= 0);
__msan_check_mem_is_initialized(output, res); __msan_check_mem_is_initialized(output, res);
} }
void testWriteZeroLength() { void testWriteZeroLength() {
char unsigned input[] = { char unsigned input[] = {
0xff, 0xc5, 0xf7, 0xff, 0x00, 0x00, 0xff, 0x0a, 0x00, 0x00, 0x00, 0x01, 0xff, 0xc5, 0xf7, 0xff, 0x00, 0x00, 0xff, 0x0a, 0x00, 0x00, 0x00, 0x01,
0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x10, 0x01, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x10, 0x01, 0x05, 0x00, 0x01, 0x00,
}; };
char output[1024]; char output[1024];
int res = dn_expand(input, input + sizeof(input), input + 23, output, int res = dn_expand(input, input + sizeof(input), input + 23, output,
sizeof(output)); sizeof(output));
assert(res >= 0); assert(res >= 0);
__msan_check_mem_is_initialized(output, res); __msan_check_mem_is_initialized(output, res);
} }
int main(int iArgc, const char* szArgv[]) { int main(int iArgc, const char *szArgv[]) {
const char* test = nullptr; const char *test = nullptr;
if (iArgc > 1) { if (iArgc > 1) {
test = szArgv[1]; test = szArgv[1];
} }
if (test == nullptr) { if (test == nullptr) {
testWrite(); testWrite();
testWriteZeroLength(); testWriteZeroLength();
} else if (strcmp(test, "READ") == 0) { } else if (strcmp(test, "READ") == 0) {
testRead(); testRead();
} }
return 0; return 0;
} }

compiler-rt/test/sanitizer_common/TestCases/Linux/dn_expand.cpp

// RUN: %clangxx %s -o %t -lresolv && %run %t %p // RUN: %clangxx %s -o %t -lresolv && %run %t %p
#include <assert.h> #include <assert.h>
#include <resolv.h> #include <resolv.h>
#include <string.h> #include <string.h>
#include <sanitizer/msan_interface.h> #include <sanitizer/msan_interface.h>
#ifdef kda_COMMENTED_OUT
void testRead() {
const int INPUT_LEN = 24;
char unsigned input[INPUT_LEN];
char output[1024];
dn_expand(input, input + sizeof(input), input + 23, output,
sizeof(output));
// READ: Uninitialized bytes in __interceptor___dn_expand
}
#endif /* kda_COMMENTED_OUT */
void testWrite() { void testWrite() {
char unsigned input[] = { char unsigned input[] = {0xff, 0xc5, 0xf7, 0xff, 0x00, 0x00, 0xff, 0x0a, 0x00,
0xff, 0xc5, 0xf7, 0xff, 0x00, 0x00, 0xff, 0x0a, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00,
0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x10, 0x01, 0x05, 0x00, 0x01, 0x0a, 0x10, 0x01, 0x05, 0x00, 0x01, 0x0a, 0x67, 0x6f, 0x6f,
0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x00 0x67, 0x6c, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x00};
};
char output[1024]; char output[1024];
int res = dn_expand(input, input + sizeof(input), input + 23, output, int res = dn_expand(input, input + sizeof(input), input + 23, output,
sizeof(output)); sizeof(output));
assert(res == 12); assert(res == 12);
assert(strcmp(output, "google\\.com") == 0); assert(strcmp(output, "google\\.com") == 0);
} }
void testWriteZeroLength() { void testWriteZeroLength() {
char unsigned input[] = { char unsigned input[] = {
0xff, 0xc5, 0xf7, 0xff, 0x00, 0x00, 0xff, 0x0a, 0x00, 0x00, 0x00, 0x01, 0xff, 0xc5, 0xf7, 0xff, 0x00, 0x00, 0xff, 0x0a, 0x00, 0x00, 0x00, 0x01,
0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x10, 0x01, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x10, 0x01, 0x05, 0x00, 0x01, 0x00,
}; };
char output[1024]; char output[1024];
int res = dn_expand(input, input + sizeof(input), input + 23, output, int res = dn_expand(input, input + sizeof(input), input + 23, output,
sizeof(output)); sizeof(output));
assert(res == 1); assert(res == 1);
assert(strcmp(output, "") == 0); assert(strcmp(output, "") == 0);
} }
int main(int iArgc, const char* szArgv[]) { int main(int iArgc, const char *szArgv[]) {
#ifdef kda_COMMENTED_OUT
const char* test = nullptr;
if (iArgc > 1) {
test = szArgv[1];
}
#endif /* kda_COMMENTED_OUT */
#ifdef kda_COMMENTED_OUT
if (test == nullptr) {
#endif /* kda_COMMENTED_OUT */
testWrite(); testWrite();
testWriteZeroLength(); testWriteZeroLength();
#ifdef kda_COMMENTED_OUT
} else if (strcmp(test, "READ") == 0) {
testRead();
}
#endif /* kda_COMMENTED_OUT */
return 0; return 0;
} }