From: Eric Biggers <ebiggers@google.com>
Date: Wed, 25 Jan 2023 23:45:33 +0000 (+0000)
Subject: AOSP: e2fsdroid: stop disabling address sanitization
X-Git-Tag: v1.46.6~36
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=0c7e1296e4a1b4318d2a388e8a9832c2e6d0c5f3;p=tools%2Fe2fsprogs.git

AOSP: e2fsdroid: stop disabling address sanitization

Address sanitization was disabled in e2fsdroid over 5 years ago, due to
a bug in libext2fs.  However, that bug has long since been fixed by
upstream commit 689b7be2da01 ("libext2fs: avoid dereferencing beyond
allocated memory in xattr code").  So it should be fine to re-enable
address sanitization now.

Bug: 68387795
Change-Id: I89a7a1ec1a45d0a2ed76d2e5938dbc127eb267a6
From AOSP commit: c3b223fedcb94e5763c48b93a4445289d13a5eb0
---

diff --git a/contrib/android/Android.bp b/contrib/android/Android.bp
index 189211b..6c9dd5c 100644
--- a/contrib/android/Android.bp
+++ b/contrib/android/Android.bp
@@ -41,9 +41,6 @@ cc_binary {
                 "libcrypto",
                 "liblog",
             ],
-            sanitize: {
-                address: false,  // http://b/68387795 - heap overflow in e2fsdroid
-            },
         },
         android: {
             static_libs: [