Skip to content

Commit 12b0954

Browse files
protonjohnzx2c4
authored andcommitted
WireGuardKit: fix incorrect IP address allocation size
According to [1], the `capacity` parameter is specified as "the number of instances of T in the re-bound region" and not the total size of the rebound struct. Without this patch, there are crashes in the extension with the following error: Fatal error: self must be a properly aligned pointer for types Pointee and T` Since the subsequent line in the code only reads `sizeof(in_addr)` or `sizeof(in6_addr)` anyway, change the `capacity` parameter to just be a count of 1. [1] https://developer.apple.com/documentation/swift/unsafepointer/withmemoryrebound(to:capacity:_:) Signed-off-by: John Biggs <[email protected]> Signed-off-by: Jason A. Donenfeld <[email protected]>
1 parent 9c07693 commit 12b0954

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Sources/WireGuardKit/IPAddress+AddrInfo.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ extension IPv4Address {
88
init?(addrInfo: addrinfo) {
99
guard addrInfo.ai_family == AF_INET else { return nil }
1010

11-
let addressData = addrInfo.ai_addr.withMemoryRebound(to: sockaddr_in.self, capacity: MemoryLayout<sockaddr_in>.size) { ptr -> Data in
11+
let addressData = addrInfo.ai_addr.withMemoryRebound(to: sockaddr_in.self, capacity: 1) { ptr -> Data in
1212
return Data(bytes: &ptr.pointee.sin_addr, count: MemoryLayout<in_addr>.size)
1313
}
1414

@@ -20,7 +20,7 @@ extension IPv6Address {
2020
init?(addrInfo: addrinfo) {
2121
guard addrInfo.ai_family == AF_INET6 else { return nil }
2222

23-
let addressData = addrInfo.ai_addr.withMemoryRebound(to: sockaddr_in6.self, capacity: MemoryLayout<sockaddr_in6>.size) { ptr -> Data in
23+
let addressData = addrInfo.ai_addr.withMemoryRebound(to: sockaddr_in6.self, capacity: 1) { ptr -> Data in
2424
return Data(bytes: &ptr.pointee.sin6_addr, count: MemoryLayout<in6_addr>.size)
2525
}
2626

0 commit comments

Comments
 (0)