apply kDtvOffset correctly

vitalybuka · vitalybuka · commit dd3f250c25b9 · 2024-09-10T17:59:59.000-07:00
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_tls_get_addr.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_tls_get_addr.cpp
@@ -152,8 +152,8 @@ DTLS::DTV *DTLS_on_tls_get_addr(void *arg_void, void *res,
     tls_size = 0;
   }
   if (tls_size) {
-    CHECK_LE(tls_beg, reinterpret_cast<uptr>(res) + kDtvOffset);
-    CHECK_LT(reinterpret_cast<uptr>(res) + kDtvOffset, tls_beg + tls_size);
+    CHECK_LE(tls_beg, reinterpret_cast<uptr>(res) - kDtvOffset);
+    CHECK_LT(reinterpret_cast<uptr>(res) - kDtvOffset, tls_beg + tls_size);
   }
   dtv->beg = tls_beg;
   dtv->size = tls_size;

Original file line number	Diff line number	Diff line change
`@@ -152,8 +152,8 @@ DTLS::DTV DTLS_on_tls_get_addr(void arg_void, void *res,`
`152`	`152`	`tls_size = 0;`
`153`	`153`	`}`
`154`	`154`	`if (tls_size) {`
`155`		`- CHECK_LE(tls_beg, reinterpret_cast<uptr>(res) + kDtvOffset);`
`156`		`- CHECK_LT(reinterpret_cast<uptr>(res) + kDtvOffset, tls_beg + tls_size);`
	`155`	`+ CHECK_LE(tls_beg, reinterpret_cast<uptr>(res) - kDtvOffset);`
	`156`	`+ CHECK_LT(reinterpret_cast<uptr>(res) - kDtvOffset, tls_beg + tls_size);`
`157`	`157`	`}`
`158`	`158`	`dtv->beg = tls_beg;`
`159`	`159`	`dtv->size = tls_size;`