i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel/fs: allow sendto to be called with a NULL address

Browse Source 
POSIX says: If the socket is connection-mode, dest_addr shall be ignored.

Change-Id: Ic75de473173e3795066beeac9a9f2404418d94da
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2547
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Jérôme Duval
2020-05-02 00:52:20 +00:00
committed by waddlesplash
parent bf9a85cb01
commit 0424248dcb
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/fs/socket.cpp
+6 -4
View File
@@ -1036,25 +1036,27 @@ _user_sendto(int socket, const void *data, size_t length, int flags,
if (data == NULL || !IS_USER_ADDRESS(data)) if (data == NULL || !IS_USER_ADDRESS(data))
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
// TODO: If this is a connection-mode socket, the address parameter is if (addressLength <= 0
// supposed to be ignored.
if (userAddress == NULL || addressLength <= 0
|| addressLength > MAX_SOCKET_ADDRESS_LENGTH) { || addressLength > MAX_SOCKET_ADDRESS_LENGTH) {
return B_BAD_VALUE; return B_BAD_VALUE;
} }
// copy address from userland // copy address from userland
char address[MAX_SOCKET_ADDRESS_LENGTH]; char address[MAX_SOCKET_ADDRESS_LENGTH];
if (userAddress != NULL) {
if (!IS_USER_ADDRESS(userAddress) if (!IS_USER_ADDRESS(userAddress)
|| user_memcpy(address, userAddress, addressLength) != B_OK) { || user_memcpy(address, userAddress, addressLength) != B_OK) {
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
} }
} else {
addressLength = 0;
}
// sendto() // sendto()
SyscallRestartWrapper<ssize_t> result; SyscallRestartWrapper<ssize_t> result;
return result = common_sendto(socket, data, length, flags, return result = common_sendto(socket, data, length, flags,
(sockaddr*)address, addressLength, false); userAddress != NULL ? (sockaddr*)address : NULL, addressLength, false);
} }