<div dir="ltr">would be great to include some details on why a patch is reverted in the commit message - helps other folks know if the revert will fix an issue they're seeing locally/on a buildbot, etc.</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Aug 20, 2021 at 4:21 AM Florian Mayer via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br>
Author: Florian Mayer<br>
Date: 2021-08-20T12:21:00+01:00<br>
New Revision: de916a7b12adc842a2cc23505d78412e8b5166d2<br>
<br>
URL: <a href="https://github.com/llvm/llvm-project/commit/de916a7b12adc842a2cc23505d78412e8b5166d2" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/de916a7b12adc842a2cc23505d78412e8b5166d2</a><br>
DIFF: <a href="https://github.com/llvm/llvm-project/commit/de916a7b12adc842a2cc23505d78412e8b5166d2.diff" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/de916a7b12adc842a2cc23505d78412e8b5166d2.diff</a><br>
<br>
LOG: Revert "[hwasan] do not check if freed pointer belonged to allocator."<br>
<br>
This reverts commit 119146f8ae25c31ea630a15761a6fba6b7eb909c.<br>
<br>
Added: <br>
<br>
<br>
Modified: <br>
    compiler-rt/lib/hwasan/hwasan_allocator.cpp<br>
<br>
Removed: <br>
<br>
<br>
<br>
################################################################################<br>
diff  --git a/compiler-rt/lib/hwasan/hwasan_allocator.cpp b/compiler-rt/lib/hwasan/hwasan_allocator.cpp<br>
index 3e7271f93fb61..63d86cf99e582 100644<br>
--- a/compiler-rt/lib/hwasan/hwasan_allocator.cpp<br>
+++ b/compiler-rt/lib/hwasan/hwasan_allocator.cpp<br>
@@ -208,7 +208,8 @@ static bool PointerAndMemoryTagsMatch(void *tagged_ptr) {<br>
 static bool CheckInvalidFree(StackTrace *stack, void *untagged_ptr,<br>
                              void *tagged_ptr) {<br>
   // This function can return true if halt_on_error is false.<br>
-  if (!PointerAndMemoryTagsMatch(tagged_ptr)) {<br>
+  if (!allocator.PointerIsMine(untagged_ptr) ||<br>
+      !PointerAndMemoryTagsMatch(tagged_ptr)) {<br>
     ReportInvalidFree(stack, reinterpret_cast<uptr>(tagged_ptr));<br>
     return true;<br>
   }<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>