[PATCH 7/7] ws2_32: Manage shorter length for IPV6_HOPLIMIT.
Paul Gofman
pgofman at codeweavers.com
Thu Mar 10 03:40:58 CST 2022
Signed-off-by: Paul Gofman <pgofman at codeweavers.com>
---
dlls/ws2_32/socket.c | 11 +++++++++++
dlls/ws2_32/tests/sock.c | 1 +
2 files changed, 12 insertions(+)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index ba9341befa6..a9e0898e2d7 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -1819,6 +1819,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl
return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_DONTFRAG, optval, optlen );
case IPV6_HOPLIMIT:
+ if (*optlen < sizeof(DWORD) || !optval)
+ {
+ *optlen = 0;
+ SetLastError( WSAEFAULT );
+ return SOCKET_ERROR;
+ }
return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVHOPLIMIT, optval, optlen );
case IPV6_MULTICAST_HOPS:
@@ -3179,6 +3185,11 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int
return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP, optval, optlen );
case IPV6_HOPLIMIT:
+ if (optlen < sizeof(DWORD) || !optval)
+ {
+ SetLastError( WSAEFAULT );
+ return SOCKET_ERROR;
+ }
return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_RECVHOPLIMIT, optval, optlen );
case IPV6_MULTICAST_HOPS:
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index baccf8a2dc9..e3e047ed346 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -1190,6 +1190,7 @@ static void test_set_getsockopt(void)
{AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TOS, TRUE, {1, 1, 4}, {0}, FALSE},
{AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TTL, TRUE, {1, 1, 4}, {0}, FALSE},
{AF_INET6, SOCK_STREAM, IPPROTO_IPV6, IPV6_DONTFRAG, TRUE, {1, 1, 4}, {0}, TRUE, TRUE},
+ {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_HOPLIMIT, FALSE, {0, 0, 4}, {0}, TRUE, TRUE},
};
SOCKET s, s2;
int i, j, err, lasterr;
--
2.35.1
More information about the wine-devel
mailing list