aboutsummaryrefslogtreecommitdiffstats
path: root/executor/executor.cc
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2024-06-25 15:43:52 +0200
committerDmitry Vyukov <dvyukov@google.com>2024-06-25 13:58:54 +0000
commitdc5564eb36462b29de4a0dbf85ef9f91df2eecca (patch)
treebe71aec17a1289b7cba876dfec19d86bf6d1955f /executor/executor.cc
parent707e48e60aa33a49ef5c753466930f70227a7d21 (diff)
executor: prohibit malloc/calloc via linter
We include a number of C++ headers in the runnner. On FreeBSD some of them mention malloc, and our defines break the build. Use the style test to check only our files for these things.
Diffstat (limited to 'executor/executor.cc')
-rw-r--r--executor/executor.cc14
1 files changed, 1 insertions, 13 deletions
diff --git a/executor/executor.cc b/executor/executor.cc
index a4ea17f47..cf80d7491 100644
--- a/executor/executor.cc
+++ b/executor/executor.cc
@@ -62,18 +62,6 @@ typedef unsigned int uint32;
typedef unsigned short uint16;
typedef unsigned char uint8;
-// exit/_exit do not necessary work (e.g. if fuzzer sets seccomp filter that prohibits exit_group).
-// Use doexit instead. We must redefine exit to something that exists in stdlib,
-// because some standard libraries contain "using ::exit;", but has different signature.
-#define exit vsnprintf
-
-// Dynamic memory allocation reduces test reproducibility across different libc versions and kernels.
-// malloc will cause unspecified number of additional mmap's at unspecified locations.
-// For small objects prefer stack allocations, for larger -- either global objects (this may have
-// issues with concurrency), or controlled mmaps, or make the fuzzer allocate memory.
-#define malloc do_not_use_malloc
-#define calloc do_not_use_calloc
-
// Note: zircon max fd is 256.
// Some common_OS.h files know about this constant for RLIMIT_NOFILE.
const int kMaxFd = 250;
@@ -1440,7 +1428,7 @@ void copyin_int(char* addr, uint64 val, uint64 bf, uint64 bf_off, uint64 bf_len)
const uint64 shift = bf_off;
#endif
x = (x & ~BITMASK(shift, bf_len)) | ((val << shift) & BITMASK(shift, bf_len));
- debug_verbose("copyin_int<%zu>: new x=0x%llx\n", sizeof(T), (uint64)x);
+ debug_verbose("copyin_int<%zu>: x=0x%llx\n", sizeof(T), (uint64)x);
*(T*)addr = swap(x, sizeof(T), bf);
}