[compiler-rt][rtsan] intercept fflush. #121643
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-compiler-rt-sanitizer Author: David CARLIER (devnexen) ChangesFull diff: https://github.com/llvm/llvm-project/pull/121643.diff 2 Files Affected:
diff --git a/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp b/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp
index 227d077290af71..d1988c3ace04c4 100644
--- a/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp
+++ b/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp
@@ -292,6 +292,11 @@ INTERCEPTOR(int, fputs, const char *s, FILE *stream) {
return REAL(fputs)(s, stream);
}
+INTERCEPTOR(int, fflush, FILE *stream) {
+ __rtsan_notify_intercepted_call("fflush");
+ return REAL(fflush)(stream);
+}
+
INTERCEPTOR(FILE *, fdopen, int fd, const char *mode) {
__rtsan_notify_intercepted_call("fdopen");
return REAL(fdopen)(fd, mode);
@@ -1012,6 +1017,7 @@ void __rtsan::InitializeInterceptors() {
RTSAN_MAYBE_INTERCEPT_CREAT64;
INTERCEPT_FUNCTION(puts);
INTERCEPT_FUNCTION(fputs);
+ INTERCEPT_FUNCTION(fflush);
INTERCEPT_FUNCTION(fdopen);
INTERCEPT_FUNCTION(freopen);
RTSAN_MAYBE_INTERCEPT_FOPENCOOKIE;
diff --git a/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp b/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp
index 2947510b2cfde8..042fa49a638330 100644
--- a/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp
+++ b/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp
@@ -654,6 +654,19 @@ TEST_F(RtsanOpenedFileTest, FputsDiesWhenRealtime) {
ExpectNonRealtimeSurvival(Func);
}
+TEST_F(RtsanFileTest, FflushDiesWhenRealtime) {
+ FILE *f = fopen(GetTemporaryFilePath(), "w");
+ EXPECT_THAT(f, Ne(nullptr));
+ int r = fwrite("abc", 1, 3, f);
+ EXPECT_THAT(r, Eq(3));
+ auto Func = [&f]() {
+ int r = fflush(f);
+ EXPECT_THAT(r, Eq(0));
+ };
+ ExpectRealtimeDeath(Func, "fflush");
+ ExpectNonRealtimeSurvival(Func);
+}
+
TEST_F(RtsanOpenedFileTest, ReadDiesWhenRealtime) {
auto Func = [this]() {
char c{};
|
cjappl
approved these changes
Jan 4, 2025
| TEST_F(RtsanFileTest, FflushDiesWhenRealtime) { | ||
| FILE *f = fopen(GetTemporaryFilePath(), "w"); | ||
| EXPECT_THAT(f, Ne(nullptr)); | ||
| int r = fwrite("abc", 1, 3, f); |
There was a problem hiding this comment.
nit: Could have a more descriptive name bytes_written/num_written/written or similar
| @@ -292,6 +292,11 @@ INTERCEPTOR(int, fputs, const char *s, FILE *stream) { | |||
| return REAL(fputs)(s, stream); | |||
| } | |||
|
|
|||
| INTERCEPTOR(int, fflush, FILE *stream) { | |||
There was a problem hiding this comment.
Do you plan to add fpurge as well? man fflush on Darwin also contains details for fpurge - it might be nice to do them both at the same time
There was a problem hiding this comment.
did not think of it sure I would need to switch to my m3 to try it.
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/73/builds/11150 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.