From dfc0c2e56eef69987522492434ba79209a377a1d Mon Sep 17 00:00:00 2001 From: Evgenii Stepanov Date: Tue, 22 Jun 2021 16:40:17 -0700 Subject: [scudo] Handle predefined M_MEMTAG_TUNING_* constants (NFC). Bionic may provide the definitions of M_MEMTAG_TUNING_* constants. Do not redefine them in that case. Differential Revision: https://reviews.llvm.org/D104758 GitOrigin-RevId: d693957e58ff498dba7ef1d05c08849693abff35 Bug: 191769584 Test: N/A (NFC) Merged-In: Iab42b389fe7c52716db3bd498f815ac8948f38b8 Change-Id: Iab42b389fe7c52716db3bd498f815ac8948f38b8 (cherry picked from commit fdad5742fc12edb9dea42d3912ff210e83ee0ea1) --- standalone/include/scudo/interface.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/standalone/include/scudo/interface.h b/standalone/include/scudo/interface.h index 0e6cf3d4e25..9b9a84623c5 100644 --- a/standalone/include/scudo/interface.h +++ b/standalone/include/scudo/interface.h @@ -120,7 +120,7 @@ size_t __scudo_get_ring_buffer_size(); // 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 -// 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 #define M_MEMTAG_TUNING -102 #endif @@ -145,13 +145,15 @@ size_t __scudo_get_ring_buffer_size(); #define M_TSDS_COUNT_MAX -202 #endif -enum scudo_memtag_tuning { - // Tune for buffer overflows. - M_MEMTAG_TUNING_BUFFER_OVERFLOW, +// Tune for buffer overflows. +#ifndef M_MEMTAG_TUNING_BUFFER_OVERFLOW +#define M_MEMTAG_TUNING_BUFFER_OVERFLOW 0 +#endif - // Tune for use-after-free. - M_MEMTAG_TUNING_UAF, -}; +// Tune for use-after-free. +#ifndef M_MEMTAG_TUNING_UAF +#define M_MEMTAG_TUNING_UAF 1 +#endif } // extern "C" -- cgit v1.2.3