Revert "[DFSan] Add bcmp wrapper."

This reverts commit 559f919812 due to bot
failure.
This commit is contained in:
Matt Morehouse 2020-09-17 08:43:26 -07:00
parent 7688027f16
commit df017fd906
3 changed files with 2 additions and 31 deletions

View File

@ -129,14 +129,6 @@ SANITIZER_INTERFACE_ATTRIBUTE int __dfsw_memcmp(const void *s1, const void *s2,
return 0;
}
SANITIZER_INTERFACE_ATTRIBUTE int __dfsw_bcmp(const void *s1, const void *s2,
size_t n, dfsan_label s1_label,
dfsan_label s2_label,
dfsan_label n_label,
dfsan_label *ret_label) {
return __dfsw_memcmp(s1, s2, n, s1_label, s2_label, n_label, ret_label);
}
DECLARE_WEAK_INTERCEPTOR_HOOK(dfsan_weak_hook_strcmp, uptr caller_pc,
const char *s1, const char *s2,
dfsan_label s1_label, dfsan_label s2_label)

View File

@ -183,7 +183,6 @@ fun:strtoull=custom
# Functions that produce an output that is computed from the input, but is not
# necessarily data dependent.
fun:bcmp=custom
fun:memchr=custom
fun:memcmp=custom
fun:strcasecmp=custom

View File

@ -17,13 +17,12 @@
#include <pwd.h>
#include <sched.h>
#include <signal.h>
#include <stdint.h>
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <strings.h>
#include <sys/resource.h>
#include <sys/select.h>
#include <sys/resource.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h>
@ -87,24 +86,6 @@ void test_memcmp() {
#endif
}
void test_bcmp() {
char str1[] = "str1", str2[] = "str2";
dfsan_set_label(i_label, &str1[3], 1);
dfsan_set_label(j_label, &str2[3], 1);
int rv = bcmp(str1, str2, sizeof(str1));
assert(rv != 0);
#ifdef STRICT_DATA_DEPENDENCIES
ASSERT_ZERO_LABEL(rv);
#else
ASSERT_LABEL(rv, i_j_label);
#endif
rv = bcmp(str1, str2, sizeof(str1) - 2);
assert(rv == 0);
ASSERT_ZERO_LABEL(rv);
}
void test_memcpy() {
char str1[] = "str1";
char str2[sizeof(str1)];
@ -986,7 +967,6 @@ int main(void) {
assert(i_j_label != j_label);
assert(i_j_label != k_label);
test_bcmp();
test_calloc();
test_clock_gettime();
test_ctime_r();