This is an archive of the discontinued LLVM Phabricator instance.

Differential D9459

[Msan] Fix the ioctl_custom.cc test to pass on FreeBSD
ClosedPublic

Authored by kutuzov.viktor.84 on May 2 2015, 8:59 AM.

Details

Reviewers
kcc
samsonov
eugenis
Commits
rCRT236581: [Msan] Fix the ioctl_custom.cc test to pass on FreeBSD
rL236581: [Msan] Fix the ioctl_custom.cc test to pass on FreeBSD

Diff Detail

Event Timeline

kutuzov.viktor.84 updated this revision to Diff 24858.May 2 2015, 8:59 AM
kutuzov.viktor.84 retitled this revision from to [Msan] Fix the ioctl_custom.cc test to pass on FreeBSD.
kutuzov.viktor.84 updated this object.
kutuzov.viktor.84 edited the test plan for this revision. (Show Details)
kutuzov.viktor.84 added reviewers: kcc, samsonov, eugenis.
kutuzov.viktor.84 added subscribers: Unknown Object (MLST), emaste.
samsonov accepted this revision.May 5 2015, 11:03 AM
samsonov edited edge metadata.

LGTM

This revision is now accepted and ready to land.May 5 2015, 11:03 AM
Closed by commit rL236581: [Msan] Fix the ioctl_custom.cc test to pass on FreeBSD (authored by vkutuzov). · Explain WhyMay 6 2015, 2:32 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
sanitizer_common/
20 lines

Diff 24858

lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc

Show First 20 Lines • Show All 572 Lines • ▼ Show 20 Lines
static void ioctl_common_pre(void *ctx, const ioctl_desc *desc, int d, static void ioctl_common_pre(void *ctx, const ioctl_desc *desc, int d,
unsigned request, void *arg) { unsigned request, void *arg) {
if (desc->type == ioctl_desc::READ || desc->type == ioctl_desc::READWRITE) { if (desc->type == ioctl_desc::READ || desc->type == ioctl_desc::READWRITE) {
unsigned size = desc->size ? desc->size : IOC_SIZE(request); unsigned size = desc->size ? desc->size : IOC_SIZE(request);
COMMON_INTERCEPTOR_READ_RANGE(ctx, arg, size); COMMON_INTERCEPTOR_READ_RANGE(ctx, arg, size);
} }
if (desc->type != ioctl_desc::CUSTOM) if (desc->type != ioctl_desc::CUSTOM)
return; return;
switch (request) { if (request == IOCTL_SIOCGIFCONF) {
case 0x00008912: { // SIOCGIFCONF
struct __sanitizer_ifconf *ifc = (__sanitizer_ifconf *)arg; struct __sanitizer_ifconf *ifc = (__sanitizer_ifconf *)arg;
COMMON_INTERCEPTOR_READ_RANGE(ctx, &ifc->ifc_len, sizeof(ifc->ifc_len)); COMMON_INTERCEPTOR_READ_RANGE(ctx, &ifc->ifc_len, sizeof(ifc->ifc_len));
break;
}
} }
return;
} }
static void ioctl_common_post(void *ctx, const ioctl_desc *desc, int res, int d, static void ioctl_common_post(void *ctx, const ioctl_desc *desc, int res, int d,
unsigned request, void *arg) { unsigned request, void *arg) {
if (desc->type == ioctl_desc::WRITE || desc->type == ioctl_desc::READWRITE) { if (desc->type == ioctl_desc::WRITE || desc->type == ioctl_desc::READWRITE) {
// FIXME: add verbose output // FIXME: add verbose output
unsigned size = desc->size ? desc->size : IOC_SIZE(request); unsigned size = desc->size ? desc->size : IOC_SIZE(request);
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, arg, size); COMMON_INTERCEPTOR_WRITE_RANGE(ctx, arg, size);
} }
if (desc->type != ioctl_desc::CUSTOM) if (desc->type != ioctl_desc::CUSTOM)
return; return;
switch (request) { if (request == IOCTL_SIOCGIFCONF) {
case 0x00008912: { // SIOCGIFCONF
struct __sanitizer_ifconf *ifc = (__sanitizer_ifconf *)arg; struct __sanitizer_ifconf *ifc = (__sanitizer_ifconf *)arg;
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ifc->ifc_ifcu.ifcu_req, ifc->ifc_len); COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ifc->ifc_ifcu.ifcu_req, ifc->ifc_len);
break;
}
} }
return;
} }