]> granicus.if.org Git - llvm/commitdiff
Register kASan shadow offset for NetBSD/amd64
authorKamil Rytarowski <n54@gmx.com>
Sat, 15 Dec 2018 16:32:41 +0000 (16:32 +0000)
committerKamil Rytarowski <n54@gmx.com>
Sat, 15 Dec 2018 16:32:41 +0000 (16:32 +0000)
The NetBSD x86_64 kernel uses the 0xdfff900000000000 shadow
offset.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@349276 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Transforms/Instrumentation/AddressSanitizer.cpp

index 87288388853d1e3d9f5aac4a0cf034b79e8c6f61..a5c64f354f4ba0c74bc75ba3622e1db72d214658 100644 (file)
@@ -109,6 +109,7 @@ static const uint64_t kFreeBSD_ShadowOffset32 = 1ULL << 30;
 static const uint64_t kFreeBSD_ShadowOffset64 = 1ULL << 46;
 static const uint64_t kNetBSD_ShadowOffset32 = 1ULL << 30;
 static const uint64_t kNetBSD_ShadowOffset64 = 1ULL << 46;
+static const uint64_t kNetBSDKasan_ShadowOffset64 = 0xdfff900000000000;
 static const uint64_t kPS4CPU_ShadowOffset64 = 1ULL << 40;
 static const uint64_t kWindowsShadowOffset32 = 3ULL << 28;
 
@@ -544,9 +545,12 @@ static ShadowMapping getShadowMapping(Triple &TargetTriple, int LongSize,
       Mapping.Offset = kSystemZ_ShadowOffset64;
     else if (IsFreeBSD && !IsMIPS64)
       Mapping.Offset = kFreeBSD_ShadowOffset64;
-    else if (IsNetBSD)
-      Mapping.Offset = kNetBSD_ShadowOffset64;
-    else if (IsPS4CPU)
+    else if (IsNetBSD) {
+      if (IsKasan)
+        Mapping.Offset = kNetBSDKasan_ShadowOffset64;
+      else
+        Mapping.Offset = kNetBSD_ShadowOffset64;
+    } else if (IsPS4CPU)
       Mapping.Offset = kPS4CPU_ShadowOffset64;
     else if (IsLinux && IsX86_64) {
       if (IsKasan)