[compiler-rt] [compiler-rt][rtsan] fopencookie support. (PR #120864)
David CARLIER via llvm-commits
llvm-commits at lists.llvm.org
Sat Dec 21 16:14:46 PST 2024
https://github.com/devnexen created https://github.com/llvm/llvm-project/pull/120864
None
>From 0b85ffe28fb22db3be82778e59ae92c2802b35e5 Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen at gmail.com>
Date: Sun, 22 Dec 2024 00:14:06 +0000
Subject: [PATCH] [compiler-rt][rtsan] fopencookie support.
---
.../lib/rtsan/rtsan_interceptors_posix.cpp | 7 +++++
.../tests/rtsan_test_interceptors_posix.cpp | 27 +++++++++++++++++--
2 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp b/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp
index 4e51f464b57304..072923ab35ae0d 100644
--- a/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp
+++ b/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp
@@ -297,6 +297,12 @@ INTERCEPTOR(FILE *, fdopen, int fd, const char *mode) {
return REAL(fdopen)(fd, mode);
}
+INTERCEPTOR(FILE *, fopencookie, void *cookie, const char *mode,
+ cookie_io_functions_t funcs) {
+ __rtsan_notify_intercepted_call("fopencookie");
+ return REAL(fopencookie)(cookie, mode, funcs);
+}
+
#if SANITIZER_INTERCEPT_OPEN_MEMSTREAM
INTERCEPTOR(FILE *, open_memstream, char **buf, size_t *size) {
__rtsan_notify_intercepted_call("open_memstream");
@@ -972,6 +978,7 @@ void __rtsan::InitializeInterceptors() {
INTERCEPT_FUNCTION(fputs);
INTERCEPT_FUNCTION(fdopen);
INTERCEPT_FUNCTION(freopen);
+ INTERCEPT_FUNCTION(fopencookie);
RTSAN_MAYBE_INTERCEPT_OPEN_MEMSTREAM;
RTSAN_MAYBE_INTERCEPT_FMEMOPEN;
INTERCEPT_FUNCTION(lseek);
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 b052dd859dcdf6..8fa396fb415ac5 100644
--- a/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp
+++ b/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp
@@ -299,7 +299,7 @@ TEST_F(RtsanFileTest, FcntlFlockDiesWhenRealtime) {
ASSERT_THAT(fd, Ne(-1));
auto Func = [fd]() {
- struct flock lock {};
+ struct flock lock{};
lock.l_type = F_RDLCK;
lock.l_whence = SEEK_SET;
lock.l_start = 0;
@@ -353,6 +353,29 @@ TEST_F(RtsanFileTest, FopenDiesWhenRealtime) {
ExpectNonRealtimeSurvival(Func);
}
+TEST_F(RtsanFileTest, FopenCookieDieWhenRealtime) {
+ FILE *f = fopen(GetTemporaryFilePath(), "w");
+ EXPECT_THAT(f, Ne(nullptr));
+ struct fholder {
+ FILE *fp;
+ size_t read;
+ } fh = {f, 0};
+ auto CookieRead = [this](void *cookie, char *buf, size_t size) {
+ fholder *p = reinterpret_cast<fholder *>(cookie);
+ p->read = fread(static_cast<void *>(buf), 1, size, p->fp);
+ EXPECT_NE(0, p->read);
+ };
+ cookie_io_functions_t funcs = {(cookie_read_function_t *)&CookieRead, nullptr,
+ nullptr, nullptr};
+ auto Func = [&fh, &funcs]() {
+ FILE *f = fopencookie(&fh, "w", funcs);
+ EXPECT_THAT(f, Ne(nullptr));
+ };
+
+ ExpectRealtimeDeath(Func, "fopencookie");
+ ExpectNonRealtimeSurvival(Func);
+}
+
#if SANITIZER_INTERCEPT_OPEN_MEMSTREAM
TEST_F(RtsanFileTest, OpenMemstreamDiesWhenRealtime) {
char *buffer;
@@ -453,7 +476,7 @@ TEST(TestRtsanInterceptors, IoctlBehavesWithOutputPointer) {
GTEST_SKIP();
}
- struct ifreq ifr {};
+ struct ifreq ifr{};
strncpy(ifr.ifr_name, ifaddr->ifa_name, IFNAMSIZ - 1);
int retval = ioctl(sock, SIOCGIFADDR, &ifr);
More information about the llvm-commits
mailing list