[PATCH] D116861: [UBSan] Fix incorrect alignment reported when global new returns an offset pointer
Lambert Clara via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Sat Jan 8 10:12:10 PST 2022
belkiss updated this revision to Diff 398350.
belkiss added a comment.
Squash commits, for some reason update dropped the first commit (first time using arcanist...).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D116861/new/
https://reviews.llvm.org/D116861
Files:
clang/lib/CodeGen/CGExprCXX.cpp
compiler-rt/test/ubsan/TestCases/TypeCheck/global-new-alignment.cpp
Index: compiler-rt/test/ubsan/TestCases/TypeCheck/global-new-alignment.cpp
===================================================================
--- /dev/null
+++ compiler-rt/test/ubsan/TestCases/TypeCheck/global-new-alignment.cpp
@@ -0,0 +1,34 @@
+// RUN: %clangxx -fsanitize=alignment %s -o %t
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not="runtime error" -allow-empty
+// Disable with msan and tsan because they also override global new
+// UNSUPPORTED: ubsan-msan, ubsan-tsan
+
+#include <cassert>
+#include <cstddef>
+#include <cstdlib>
+
+void *operator new(std::size_t count) {
+ constexpr const size_t offset = 8;
+
+ // allocate a bit more so we can safely offset it
+ void *ptr = std::malloc(count + offset);
+
+ // verify malloc returned 16 bytes aligned mem
+ static_assert(__STDCPP_DEFAULT_NEW_ALIGNMENT__ == 16,
+ "Global new doesn't return 16 bytes aligned memory!");
+ assert(((std::ptrdiff_t)ptr & (__STDCPP_DEFAULT_NEW_ALIGNMENT__ - 1)) == 0);
+
+ return (char *)ptr + offset;
+}
+
+struct Param {
+ void *_cookie1;
+ void *_cookie2;
+};
+
+static_assert(alignof(Param) == 8, "Param struct alignment must be 8 bytes!");
+
+int main() {
+ // CHECK-NOT: runtime error: constructor call on misaligned address [[PTR:0x[0-9a-f]*]] for type 'Param', which requires 16 byte alignment
+ Param *p = new Param;
+}
Index: clang/lib/CodeGen/CGExprCXX.cpp
===================================================================
--- clang/lib/CodeGen/CGExprCXX.cpp
+++ clang/lib/CodeGen/CGExprCXX.cpp
@@ -1731,7 +1731,7 @@
SkippedChecks.set(SanitizerKind::Null, nullCheck);
EmitTypeCheck(CodeGenFunction::TCK_ConstructorCall,
E->getAllocatedTypeSourceInfo()->getTypeLoc().getBeginLoc(),
- result.getPointer(), allocType, result.getAlignment(),
+ result.getPointer(), allocType, allocAlign,
SkippedChecks, numElements);
EmitNewInitializer(*this, E, allocType, elementTy, result, numElements,
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D116861.398350.patch
Type: text/x-patch
Size: 2002 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20220108/0c88129d/attachment.bin>
More information about the cfe-commits
mailing list