averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix ptrauth in RelativeDirectPointer to sign *then* cast (#41355)

Browse Source
This commit is contained in:
Kuba (Brecka) Mracek
2022-02-12 06:49:22 -08:00
committed by GitHub
parent e3b9c987b1
commit ec615b9ee0
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
include/swift/Basic/RelativePointer.h
View File

@@ -442,6 +442,16 @@ public:
return reinterpret_cast<PointerTy>(absolute);
}
void *getWithoutCast() const & {
// Check for null.
if (Nullable && RelativeOffset == 0)
return nullptr;
// The value is addressed relative to `this`.
uintptr_t absolute = detail::applyRelativeOffset(this, RelativeOffset);
return reinterpret_cast<void *>(absolute);
}
/// Apply the offset to a parameter, instead of `this`.
PointerTy getRelative(void *base) const & {
// Check for null.
@@ -511,13 +521,14 @@ public:
}
typename super::PointerTy get() const & {
auto ptr = this->super::get();
void *ptr = this->super::getWithoutCast();
#if SWIFT_PTRAUTH
if (Nullable && !ptr)
return ptr;
return ptrauth_sign_unauthenticated(ptr, ptrauth_key_function_pointer, 0);
return nullptr;
return reinterpret_cast<T *>(
ptrauth_sign_unauthenticated(ptr, ptrauth_key_function_pointer, 0));
#else
return ptr;
return reinterpret_cast<T *>(ptr);
#endif
}
@@ -525,12 +536,12 @@ public:
return this->get();
}
template <typename...ArgTy>
typename std::result_of<T* (ArgTy...)>::type operator()(ArgTy...arg) const {
template <typename... ArgTy>
typename std::result_of<T *(ArgTy...)>::type operator()(ArgTy... arg) const {
#if SWIFT_PTRAUTH
return ptrauth_sign_unauthenticated(this->super::get(),
ptrauth_key_function_pointer,
0)(std::forward<ArgTy>(arg)...);
void *ptr = this->super::getWithoutCast();
return reinterpret_cast<T *>(ptrauth_sign_unauthenticated(
ptr, ptrauth_key_function_pointer, 0))(std::forward<ArgTy>(arg)...);
#else
return this->super::get()(std::forward<ArgTy>(arg)...);
#endif