From 8a474b647c469eddf2e3d568b1385dcf8215d6e7 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Wed, 2 Jan 2019 14:59:19 -0500 Subject: [PATCH] enable both forms of slab quarantines by default --- Android.bp | 4 ++-- Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Android.bp b/Android.bp index 20d19d4..b8483e4 100644 --- a/Android.bp +++ b/Android.bp @@ -15,8 +15,8 @@ common_cflags = [ "-DWRITE_AFTER_FREE_CHECK=true", "-DSLOT_RANDOMIZE=true", "-DSLAB_CANARY=true", - "-DSLAB_QUARANTINE_RANDOM_LENGTH=0", - "-DSLAB_QUARANTINE_QUEUE_LENGTH=0", + "-DSLAB_QUARANTINE_RANDOM_LENGTH=1", + "-DSLAB_QUARANTINE_QUEUE_LENGTH=1", "-DGUARD_SLABS_INTERVAL=1", "-DGUARD_SIZE_DIVISOR=2", "-DREGION_QUARANTINE_RANDOM_LENGTH=128", diff --git a/Makefile b/Makefile index 76d1c80..d4b4d9b 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,8 @@ CONFIG_ZERO_ON_FREE := true CONFIG_WRITE_AFTER_FREE_CHECK := true CONFIG_SLOT_RANDOMIZE := true CONFIG_SLAB_CANARY := true -CONFIG_SLAB_QUARANTINE_RANDOM_LENGTH := 0 -CONFIG_SLAB_QUARANTINE_QUEUE_LENGTH := 0 +CONFIG_SLAB_QUARANTINE_RANDOM_LENGTH := 1 +CONFIG_SLAB_QUARANTINE_QUEUE_LENGTH := 1 CONFIG_GUARD_SLABS_INTERVAL := 1 CONFIG_GUARD_SIZE_DIVISOR := 2 CONFIG_REGION_QUARANTINE_RANDOM_LENGTH := 128