Skip to content

[Reflection] Sign type descriptor and access function #63999

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Mar 2, 2023
Merged

[Reflection] Sign type descriptor and access function #63999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions stdlib/public/Reflection/Sources/_Runtime/Metadata/MetadataAccessFunction.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ extension Metadata {
@available(SwiftStdlib 5.9, *)
@inlinable
public func callAsFunction(_ request: Request) -> Metadata {
let fn = unsafeBitCast(ptr, to: AccessFn0.self)
let signedPtr = PtrAuth.signAccessFn0(ptr)
let fn = unsafeBitCast(signedPtr, to: AccessFn0.self)

return fn(request).metadata
}
Expand Down Expand Up @@ -76,7 +77,8 @@ extension Metadata {
_ request: Request,
_ arg0: UnsafeRawPointer
) -> Metadata {
let fn = unsafeBitCast(ptr, to: AccessFn1.self)
let signedPtr = PtrAuth.signAccessFn1(ptr)
let fn = unsafeBitCast(signedPtr, to: AccessFn1.self)

return fn(request, arg0).metadata
}
Expand Down Expand Up @@ -119,7 +121,8 @@ extension Metadata {
_ arg0: UnsafeRawPointer,
_ arg1: UnsafeRawPointer
) -> Metadata {
let fn = unsafeBitCast(ptr, to: AccessFn2.self)
let signedPtr = PtrAuth.signAccessFn2(ptr)
let fn = unsafeBitCast(signedPtr, to: AccessFn2.self)

return fn(request, arg0, arg1).metadata
}
Expand Down Expand Up @@ -166,7 +169,8 @@ extension Metadata {
_ arg1: UnsafeRawPointer,
_ arg2: UnsafeRawPointer
) -> Metadata {
let fn = unsafeBitCast(ptr, to: AccessFn3.self)
let signedPtr = PtrAuth.signAccessFn3(ptr)
let fn = unsafeBitCast(signedPtr, to: AccessFn3.self)

return fn(request, arg0, arg1, arg2).metadata
}
Expand All @@ -187,7 +191,8 @@ extension Metadata {
_ request: Request,
_ args: [any Any.Type]
) -> Metadata {
let fn = unsafeBitCast(ptr, to: AccessFnMany.self)
let signedPtr = PtrAuth.signAccessFnMany(ptr)
let fn = unsafeBitCast(signedPtr, to: AccessFnMany.self)

return args.withUnsafeBufferPointer {
fn(
Expand All @@ -205,7 +210,8 @@ extension Metadata {
_ request: Request,
_ args: [Metadata]
) -> Metadata {
let fn = unsafeBitCast(ptr, to: AccessFnMany.self)
let signedPtr = PtrAuth.signAccessFnMany(ptr)
let fn = unsafeBitCast(signedPtr, to: AccessFnMany.self)

return args.withUnsafeBufferPointer {
fn(
Expand Down Expand Up @@ -234,7 +240,8 @@ extension Metadata {
_ request: Request,
_ args: UnsafeBufferPointer<UnsafeRawPointer>
) -> Metadata {
let fn = unsafeBitCast(ptr, to: AccessFnMany.self)
let signedPtr = PtrAuth.signAccessFnMany(ptr)
let fn = unsafeBitCast(signedPtr, to: AccessFnMany.self)

return fn(request, args.baseAddress.unsafelyUnwrapped).metadata
}
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/Reflection/Sources/_Runtime/Metadata/TypeMetadata.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ extension TypeMetadata {

address = address.unprotectedLoad(as: UnsafeRawPointer.self)

return TypeDescriptor(address)
return PtrAuth.signDescriptor(TypeDescriptor(address))
}

@inlinable
Expand Down
100 changes: 100 additions & 0 deletions stdlib/public/Reflection/Sources/_Runtime/Utils/PtrAuth.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,76 @@ extension PtrAuth {

return Metadata(signedBitPattern.rawPointer)
}

@available(SwiftStdlib 5.9, *)
@inlinable
static func signAccessFn0(_ fnPtr: UnsafeRawPointer) -> UnsafeRawPointer {
let signedBitPattern = UInt64(Builtin.int_ptrauth_sign(
fnPtr.bitPattern._value,
Key.processIndependentCode._value,
UInt64(Builtin.typePtrAuthDiscriminator(
Metadata.AccessFunction.AccessFn0.self
))
))

return signedBitPattern.rawPointer
}

@available(SwiftStdlib 5.9, *)
@inlinable
static func signAccessFn1(_ fnPtr: UnsafeRawPointer) -> UnsafeRawPointer {
let signedBitPattern = UInt64(Builtin.int_ptrauth_sign(
fnPtr.bitPattern._value,
Key.processIndependentCode._value,
UInt64(Builtin.typePtrAuthDiscriminator(
Metadata.AccessFunction.AccessFn1.self
))
))

return signedBitPattern.rawPointer
}

@available(SwiftStdlib 5.9, *)
@inlinable
static func signAccessFn2(_ fnPtr: UnsafeRawPointer) -> UnsafeRawPointer {
let signedBitPattern = UInt64(Builtin.int_ptrauth_sign(
fnPtr.bitPattern._value,
Key.processIndependentCode._value,
UInt64(Builtin.typePtrAuthDiscriminator(
Metadata.AccessFunction.AccessFn2.self
))
))

return signedBitPattern.rawPointer
}

@available(SwiftStdlib 5.9, *)
@inlinable
static func signAccessFn3(_ fnPtr: UnsafeRawPointer) -> UnsafeRawPointer {
let signedBitPattern = UInt64(Builtin.int_ptrauth_sign(
fnPtr.bitPattern._value,
Key.processIndependentCode._value,
UInt64(Builtin.typePtrAuthDiscriminator(
Metadata.AccessFunction.AccessFn3.self
))
))

return signedBitPattern.rawPointer
}

@available(SwiftStdlib 5.9, *)
@inlinable
static func signAccessFnMany(_ fnPtr: UnsafeRawPointer) -> UnsafeRawPointer {
let signedBitPattern = UInt64(Builtin.int_ptrauth_sign(
fnPtr.bitPattern._value,
Key.processIndependentCode._value,
UInt64(Builtin.typePtrAuthDiscriminator(
Metadata.AccessFunction.AccessFnMany.self
))
))

return signedBitPattern.rawPointer
}
#else
@available(SwiftStdlib 5.9, *)
@inlinable
Expand All @@ -217,6 +287,36 @@ extension PtrAuth {
static func signSuperclass(_ superclass: Metadata) -> Metadata {
superclass
}

@available(SwiftStdlib 5.9, *)
@inlinable
static func signAccessFn0(_ fnPtr: UnsafeRawPointer) -> UnsafeRawPointer {
fnPtr
}

@available(SwiftStdlib 5.9, *)
@inlinable
static func signAccessFn1(_ fnPtr: UnsafeRawPointer) -> UnsafeRawPointer {
fnPtr
}

@available(SwiftStdlib 5.9, *)
@inlinable
static func signAccessFn2(_ fnPtr: UnsafeRawPointer) -> UnsafeRawPointer {
fnPtr
}

@available(SwiftStdlib 5.9, *)
@inlinable
static func signAccessFn3(_ fnPtr: UnsafeRawPointer) -> UnsafeRawPointer {
fnPtr
}

@available(SwiftStdlib 5.9, *)
@inlinable
static func signAccessFnMany(_ fnPtr: UnsafeRawPointer) -> UnsafeRawPointer {
fnPtr
}
#endif
}

Expand Down