This is an archive of the discontinued LLVM Phabricator instance.

Differential D104758

[scudo] Handle predefined M_MEMTAG_TUNING_* constants (NFC).
ClosedPublic

Authored by eugenis on Jun 22 2021, 4:43 PM.

Details

Reviewers
pcc
hctim
Commits
rGd693957e58ff: [scudo] Handle predefined M_MEMTAG_TUNING_* constants (NFC).
Summary

Bionic <malloc.h> may provide the definitins of M_MEMTAG_TUNING_* constants.
Do not redefine them in that case.

Diff Detail

Event Timeline

eugenis created this revision.Jun 22 2021, 4:43 PM
Herald added a subscriber: cryptoad. · View Herald TranscriptJun 22 2021, 4:43 PM
eugenis requested review of this revision.Jun 22 2021, 4:43 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 22 2021, 4:43 PM
Herald added a subscriber: Restricted Project. · View Herald Transcript
eugenis updated this revision to Diff 353821.Jun 22 2021, 4:43 PM

typo

eugenis updated this revision to Diff 353822.Jun 22 2021, 4:44 PM

another typo

hctim accepted this revision.Jun 22 2021, 4:55 PM
This revision is now accepted and ready to land.Jun 22 2021, 4:55 PM
Harbormaster completed remote builds in B110532: Diff 353822.Jun 22 2021, 5:12 PM
pcc accepted this revision.Jun 22 2021, 5:23 PM

LGTM

Closed by commit rGd693957e58ff: [scudo] Handle predefined M_MEMTAG_TUNING_* constants (NFC). (authored by eugenis). · Explain WhyJun 22 2021, 5:40 PM
This revision was automatically updated to reflect the committed changes.
eugenis added a commit: rGd693957e58ff: [scudo] Handle predefined M_MEMTAG_TUNING_* constants (NFC)..

Revision Contents

PathSize
compiler-rt/
lib/
scudo/
standalone/
include/
scudo/
16 lines

Diff 353822

compiler-rt/lib/scudo/standalone/include/scudo/interface.h

Show First 20 Lines • Show All 114 Lines • ▼ Show 20 Lines
#endif #endif
#ifndef M_PURGE #ifndef M_PURGE
#define M_PURGE -101 #define M_PURGE -101
#endif #endif
// Tune the allocator's choice of memory tags to make it more likely that // Tune the allocator's choice of memory tags to make it more likely that
// a certain class of memory errors will be detected. The value argument should // a certain class of memory errors will be detected. The value argument should
// be one of the enumerators of the scudo_memtag_tuning enum below. // be one of the M_MEMTAG_TUNING_* constants below.
#ifndef M_MEMTAG_TUNING #ifndef M_MEMTAG_TUNING
#define M_MEMTAG_TUNING -102 #define M_MEMTAG_TUNING -102
#endif #endif
// Per-thread memory initialization tuning. The value argument should be one of: // Per-thread memory initialization tuning. The value argument should be one of:
// 1: Disable automatic heap initialization and, where possible, memory tagging, // 1: Disable automatic heap initialization and, where possible, memory tagging,
// on this thread. // on this thread.
// 0: Normal behavior. // 0: Normal behavior.
#ifndef M_THREAD_DISABLE_MEM_INIT #ifndef M_THREAD_DISABLE_MEM_INIT
#define M_THREAD_DISABLE_MEM_INIT -103 #define M_THREAD_DISABLE_MEM_INIT -103
#endif #endif
#ifndef M_CACHE_COUNT_MAX #ifndef M_CACHE_COUNT_MAX
#define M_CACHE_COUNT_MAX -200 #define M_CACHE_COUNT_MAX -200
#endif #endif
#ifndef M_CACHE_SIZE_MAX #ifndef M_CACHE_SIZE_MAX
#define M_CACHE_SIZE_MAX -201 #define M_CACHE_SIZE_MAX -201
#endif #endif
#ifndef M_TSDS_COUNT_MAX #ifndef M_TSDS_COUNT_MAX
#define M_TSDS_COUNT_MAX -202 #define M_TSDS_COUNT_MAX -202
#endif #endif
enum scudo_memtag_tuning {
// Tune for buffer overflows. // Tune for buffer overflows.
M_MEMTAG_TUNING_BUFFER_OVERFLOW, #ifndef M_MEMTAG_TUNING_BUFFER_OVERFLOW
#define M_MEMTAG_TUNING_BUFFER_OVERFLOW 0
#endif
// Tune for use-after-free. // Tune for use-after-free.
M_MEMTAG_TUNING_UAF, #ifndef M_MEMTAG_TUNING_UAF
}; #define M_MEMTAG_TUNING_UAF 1
#endif
} // extern "C" } // extern "C"
#endif // SCUDO_INTERFACE_H_ #endif // SCUDO_INTERFACE_H_