[PATCH] D76665: [asan] Stop instrumenting NetBSD-specific link_set sections

[Michał Górny via Phabricator via llvm-commits]

mgorny updated this revision to Diff 267631.

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D76665/new/

https://reviews.llvm.org/D76665

Files:
  llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
  llvm/test/Instrumentation/AddressSanitizer/do-not-instrument-netbsd-link_set.ll


Index: llvm/test/Instrumentation/AddressSanitizer/do-not-instrument-netbsd-link_set.ll
===================================================================
--- /dev/null
+++ llvm/test/Instrumentation/AddressSanitizer/do-not-instrument-netbsd-link_set.ll
@@ -0,0 +1,14 @@
+; This test checks that NetBSD link_set array elements remain consecutive.
+; RUN: opt < %s -asan -asan-module -S | FileCheck %s
+
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-netbsd"
+
+module asm ".hidden __stop_link_set_test_set"
+
+ at data1 = dso_local global i32 1, align 4
+ at data2 = dso_local global i32 2, align 4
+ at __link_set_test_set_sym_data1 = internal constant i8* bitcast (i32* @data1 to i8*), section "link_set_test_set", align 8
+ at __link_set_test_set_sym_data2 = internal constant i8* bitcast (i32* @data2 to i8*), section "link_set_test_set", align 8
+; CHECK: @__link_set_test_set_sym_data1 = internal constant i8*{{.*}}, section "link_set_test_set"
+; CHECK-NEXT: @__link_set_test_set_sym_data2 = internal constant i8*{{.*}}, section "link_set_test_set"
Index: llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
===================================================================
--- llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
+++ llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
@@ -1853,6 +1853,15 @@
       return false;
     }
 
+    // Do not instrument NetBSD and NetBSD-derived (such as rumpkernel) code
+    // sections dedicated for the __link_set API that expects consecutive
+    // array elements
+    if (Section.startswith("link_set")) {
+      LLVM_DEBUG(dbgs() << "Ignoring global in sorted section "
+                        << "(starts with 'link_set'): " << *G << "\n");
+      return false;
+    }
+
     // On COFF, if the section name contains '$', it is highly likely that the
     // user is using section sorting to create an array of globals similar to
     // the way initialization callbacks are registered in .init_array and


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D76665.267631.patch
Type: text/x-patch
Size: 2018 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200601/13bca7a1/attachment.bin>