-
Notifications
You must be signed in to change notification settings - Fork 15k
[UBSAN] add null and alignment checks for aggregates #164548
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
[UBSAN] add null and alignment checks for aggregates #164548
Conversation
|
Thank you for submitting a Pull Request (PR) to the LLVM Project! This PR will be automatically labeled and the relevant teams will be notified. If you wish to, you can add reviewers by using the "Reviewers" section on this page. If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers. If you have further questions, they may be answered by the LLVM GitHub User Guide. You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums. |
|
@llvm/pr-subscribers-compiler-rt-sanitizer @llvm/pr-subscribers-clang Author: VASU SHARMA (vasu-the-sharma) ChangesThis PR adds Full diff: https://github.com/llvm/llvm-project/pull/164548.diff 1 Files Affected:
diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp
index eee397f1f3d19..de6d80a273dbd 100644
--- a/clang/lib/CodeGen/CGExprAgg.cpp
+++ b/clang/lib/CodeGen/CGExprAgg.cpp
@@ -2249,6 +2249,21 @@ void CodeGenFunction::EmitAggregateCopy(LValue Dest, LValue Src, QualType Ty,
bool isVolatile) {
assert(!Ty->isAnyComplexType() && "Shouldn't happen for complex");
+ if (SanOpts.hasOneOf(SanitizerKind::Null | SanitizerKind::Alignment)) {
+ Address SrcAddr = Src.getAddress();
+ Address DestAddr = Dest.getAddress();
+
+ // Check source pointer for null and alignment violations
+ EmitTypeCheck(TCK_Load, SourceLocation(),
+ SrcAddr.emitRawPointer(*this), Ty, SrcAddr.getAlignment(),
+ SanitizerSet());
+
+ // Check destination pointer for null and alignment violations
+ EmitTypeCheck(TCK_Store, SourceLocation(),
+ DestAddr.emitRawPointer(*this), Ty, DestAddr.getAlignment(),
+ SanitizerSet());
+ }
+
Address DestPtr = Dest.getAddress();
Address SrcPtr = Src.getAddress();
|
You can test this locally with the following command:git-clang-format --diff origin/main HEAD --extensions cpp -- clang/lib/CodeGen/CGExprAgg.cpp --diff_from_common_commit
View the diff from clang-format here.diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp
index de6d80a27..1d6e3c101 100644
--- a/clang/lib/CodeGen/CGExprAgg.cpp
+++ b/clang/lib/CodeGen/CGExprAgg.cpp
@@ -2254,14 +2254,12 @@ void CodeGenFunction::EmitAggregateCopy(LValue Dest, LValue Src, QualType Ty,
Address DestAddr = Dest.getAddress();
// Check source pointer for null and alignment violations
- EmitTypeCheck(TCK_Load, SourceLocation(),
- SrcAddr.emitRawPointer(*this), Ty, SrcAddr.getAlignment(),
- SanitizerSet());
+ EmitTypeCheck(TCK_Load, SourceLocation(), SrcAddr.emitRawPointer(*this), Ty,
+ SrcAddr.getAlignment(), SanitizerSet());
// Check destination pointer for null and alignment violations
- EmitTypeCheck(TCK_Store, SourceLocation(),
- DestAddr.emitRawPointer(*this), Ty, DestAddr.getAlignment(),
- SanitizerSet());
+ EmitTypeCheck(TCK_Store, SourceLocation(), DestAddr.emitRawPointer(*this),
+ Ty, DestAddr.getAlignment(), SanitizerSet());
}
Address DestPtr = Dest.getAddress();
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add a test support this change
| bool isVolatile) { | ||
| assert(!Ty->isAnyComplexType() && "Shouldn't happen for complex"); | ||
|
|
||
| if (SanOpts.hasOneOf(SanitizerKind::Null | SanitizerKind::Alignment)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add comment block here to explain
- why we need this
if block - what is it doing.?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe there should be a Clang CodeGen test for this.
| Address DestAddr = Dest.getAddress(); | ||
|
|
||
| // Check source pointer for null and alignment violations | ||
| EmitTypeCheck(TCK_Load, SourceLocation(), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the scope should be expanded to other cases covered by EmitCheckedLValue.
| // Sanitizer checks to verify source and destination pointers are | ||
| // non-null and properly aligned before copying. | ||
| // Without these checks, undefined behavior from invalid pointers goes undetected. | ||
| if (SanOpts.hasOneOf(SanitizerKind::Null | SanitizerKind::Alignment)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I recommend omitting this check and leaving sanitizePerformTypeCheck to do its work.
Description
This PR adds sanitizer checks for null pointers and misalignment during aggregate copy operations in EmitAggregateCopy.
Current State
When copying aggregates (structs), the compiler does not validate that source and destination pointers are non-null or properly aligned when sanitizers are enabled. This allows undefined behavior from invalid pointers to go undetected at runtime.
Solution
When null or alignment sanitizers are active, this change:
This ensures memory safety violations are caught early, preventing crashes and corruption from invalid aggregate copies.
Testing
Added comprehensive test cases covering: