[PATCH 1/7] ws2_32: Manage shorter length for SO_KEEPALIVE.
Paul Gofman
pgofman at codeweavers.com
Wed Mar 9 02:59:41 CST 2022
Signed-off-by: Paul Gofman <pgofman at codeweavers.com>
---
dlls/ws2_32/socket.c | 14 +++++++++++++-
dlls/ws2_32/tests/sock.c | 1 +
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 31e8be5b6b0..1a0d28c484e 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -1525,6 +1525,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl
return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_ERROR, optval, optlen );
case SO_KEEPALIVE:
+ if (*optlen < 1 || !optval)
+ {
+ SetLastError( WSAEFAULT );
+ return SOCKET_ERROR;
+ }
+ *optlen = 1;
return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_KEEPALIVE, optval, optlen );
case SO_LINGER:
@@ -2827,7 +2833,13 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int
return -1;
case SO_KEEPALIVE:
- return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_KEEPALIVE, optval, optlen );
+ if (optlen <= 0 || !optval)
+ {
+ SetLastError( optlen ? WSAENOBUFS : WSAEFAULT );
+ return SOCKET_ERROR;
+ }
+ value = *optval;
+ return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_KEEPALIVE, (char *)&value, sizeof(value) );
case SO_LINGER:
return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_LINGER, optval, optlen );
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 3da68b0e4a8..a6505134d44 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -1171,6 +1171,7 @@ static void test_set_getsockopt(void)
{
{AF_INET, SOCK_DGRAM, SOL_SOCKET, SO_BROADCAST, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}, TRUE, TRUE},
{AF_INET, SOCK_STREAM, SOL_SOCKET, SO_DONTLINGER, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}, TRUE, TRUE},
+ {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_KEEPALIVE, TRUE, {1, 1, 1}, {0}, TRUE},
{AF_INET, SOCK_STREAM, SOL_SOCKET, SO_DONTROUTE, TRUE, {1, 1, 1}, {0}, TRUE},
{AF_INET, SOCK_STREAM, SOL_SOCKET, SO_RCVTIMEO, FALSE, {1, 2, 4}, {0}, TRUE},
{AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}, {0}, TRUE},
--
2.35.1
More information about the wine-devel
mailing list