1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc
index 7456d3c3d6653..7731a9405e031 100644
--- a/src/google/protobuf/descriptor.cc
+++ b/src/google/protobuf/descriptor.cc
@@ -343,22 +343,16 @@ class FlatAllocation {
return ends_.template Get<U>();
}
- // Avoid the reinterpret_cast if the array is empty.
- // Clang's Control Flow Integrity does not like the cast pointing to memory
- // that is not yet initialized to be of that type.
- // (from -fsanitize=cfi-unrelated-cast)
template <typename U>
+ PROTOBUF_NO_SANITIZE("cfi-unrelated-cast", "vptr")
U* Begin() const {
- int begin = BeginOffset<U>(), end = EndOffset<U>();
- if (begin == end) return nullptr;
- return reinterpret_cast<U*>(data() + begin);
+ return reinterpret_cast<U*>(data() + BeginOffset<U>());
}
template <typename U>
+ PROTOBUF_NO_SANITIZE("cfi-unrelated-cast", "vptr")
U* End() const {
- int begin = BeginOffset<U>(), end = EndOffset<U>();
- if (begin == end) return nullptr;
- return reinterpret_cast<U*>(data() + end);
+ return reinterpret_cast<U*>(data() + EndOffset<U>());
}
template <typename U>
diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h
index 71abcb9b80564..2d3ef18139e2f 100644
--- a/src/google/protobuf/map.h
+++ b/src/google/protobuf/map.h
@@ -320,6 +320,7 @@ class PROTOBUF_EXPORT UntypedMapBase {
UntypedMapBase& operator=(const UntypedMapBase&) = delete;
template <typename T>
+ PROTOBUF_NO_SANITIZE("cfi-unrelated-cast", "vptr")
T* GetKey(NodeBase* node) const {
// Debug check that `T` matches what we expect from the type info.
ABSL_DCHECK_EQ(static_cast<int>(StaticTypeKind<T>()),
@@ -332,6 +333,7 @@ class PROTOBUF_EXPORT UntypedMapBase {
}
template <typename T>
+ PROTOBUF_NO_SANITIZE("cfi-unrelated-cast", "vptr")
T* GetValue(NodeBase* node) const {
// Debug check that `T` matches what we expect from the type info.
ABSL_DCHECK_EQ(static_cast<int>(StaticTypeKind<T>()),
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
index a12a49e9971af..8b2ebe31195d2 100644
--- a/src/google/protobuf/port_def.inc
+++ b/src/google/protobuf/port_def.inc
@@ -601,6 +601,16 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
#define PROTOBUF_PREFETCH_WITH_OFFSET(base, offset)
#endif
+#if !defined(_MSVC_LANG)
+#if __has_attribute(no_sanitize)
+#define PROTOBUF_NO_SANITIZE(...) __attribute__((no_sanitize(__VA_ARGS__)))
+#else
+#define PROTOBUF_NO_SANITIZE(...)
+#endif // __has_attribute(no_sanitize)
+#else
+#define PROTOBUF_NO_SANITIZE(...)
+#endif
+
// ThreadSafeArenaz is turned off completely in opensource builds.
|
