[PATCH 1/6] ws2_32: Manage shorter length for IPV6_MULTICAST_HOPS.
Paul Gofman
pgofman at codeweavers.com
Fri Mar 11 04:29:48 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 a9e0898e2d7..f4e2f8f172c 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -1828,6 +1828,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl
return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVHOPLIMIT, optval, optlen );
case IPV6_MULTICAST_HOPS:
+ if (*optlen < 1 || !optval)
+ {
+ SetLastError( WSAEFAULT );
+ return SOCKET_ERROR;
+ }
+ if (*optlen < sizeof(DWORD)) *optlen = 1;
return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS, optval, optlen );
case IPV6_MULTICAST_IF:
@@ -3193,7 +3199,13 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int
return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_RECVHOPLIMIT, optval, optlen );
case IPV6_MULTICAST_HOPS:
- return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS, optval, optlen );
+ if (!optlen || !optval)
+ {
+ SetLastError( WSAEFAULT );
+ return SOCKET_ERROR;
+ }
+ memcpy( &value, optval, min( optlen, sizeof(value) ));
+ return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS, (char *)&value, sizeof(value) );
case IPV6_MULTICAST_IF:
return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF, optval, optlen );
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 66bd5452046..001cfc0e98e 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -1191,6 +1191,7 @@ static void test_set_getsockopt(void)
{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},
+ {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, TRUE, {1, 1, 4}, {0}, FALSE},
};
SOCKET s, s2;
int i, j, err, lasterr;
--
2.35.1
More information about the wine-devel
mailing list