[PATCH v3] ws2_32: hardcode optlen to 4 for setsockopt in the TCP_NODELAY case
According to MSDN [1], `TCP_NODELAY` parameter should be of type `BOOL` which is 4 bytes. Due to a bug [2] in rustc passing a byte instead of an int, any program written in rust that tries to set that option on a socket will fail with a "Invalid parameter supplied" error. Turns out that setsockopt on linux does not want optlen to be less than 4 bytes [3]. Windows' behavior is the following: - For optlen <= 0, return SOCKET_ERROR and set last error to WSAEFAULT - For optlen > 0, ignore the optlen value and set the TCP_NODELAY value to one if the first byte of the given optvalue is not 0. This will fix any rust program using the hyper library to do HTTP requests. [1]: https://docs.microsoft.com/en-us/windows/win32/winsock/ipproto-tcp-socket-op... [2]: https://github.com/rust-lang/rust/blob/44593aeb1387b1be355aeaf0040d5927bd80f... [3]: https://github.com/torvalds/linux/blob/d58071a8a76d779eedab38033ae4c821c3029... Signed-off-by: Bastien Orivel <eijebong(a)bananium.fr> --- dlls/ws2_32/socket.c | 10 ++++++-- dlls/ws2_32/tests/sock.c | 55 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2db441bee3c..5ac88c47b2e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2868,8 +2868,14 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int switch(optname) { case TCP_NODELAY: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, optval, optlen ); - + { + INT nodelay = *optval; + if (optlen <= 0) { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, (char*)&nodelay, sizeof(nodelay) ); + } default: FIXME("Unknown IPPROTO_TCP optname 0x%08x\n", optname); SetLastError(WSAENOPROTOOPT); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 02713a7c625..e272ed3f303 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1259,6 +1259,61 @@ static void test_set_getsockopt(void) ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + /* TCP_NODELAY: optlen doesn't matter on windows, it should work with any value */ + size = sizeof(value); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 1); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 1\n"); + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4\n"); + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 42); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 42\n"); + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, -1); + ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 0); + ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + + value = 0x100; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4 and optvalue = 0x100\n"); + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + /* Test for erroneously passing a value instead of a pointer as optval */ size = sizeof(char); err = setsockopt(s, SOL_SOCKET, SO_DONTROUTE, (char *)1, size); -- 2.34.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=103013 Your paranoid android. === w7u_2qxl (32 bit report) === ws2_32: sock.c:1315: Test failed: TCP_NODELAY should be 0 === w7u_adm (32 bit report) === ws2_32: sock.c:1315: Test failed: TCP_NODELAY should be 0 === w7u_el (32 bit report) === ws2_32: sock.c:1315: Test failed: TCP_NODELAY should be 0 === w8 (32 bit report) === ws2_32: sock.c:1315: Test failed: TCP_NODELAY should be 0 === w8adm (32 bit report) === ws2_32: sock.c:1315: Test failed: TCP_NODELAY should be 0 === w864 (32 bit report) === ws2_32: sock.c:1315: Test failed: TCP_NODELAY should be 0 === w1064v1507 (32 bit report) === ws2_32: sock.c:1315: Test failed: TCP_NODELAY should be 0 === w1064v1809 (32 bit report) === ws2_32: sock.c:1315: Test failed: TCP_NODELAY should be 0 === w1064 (32 bit report) === ws2_32: sock.c:1315: Test failed: TCP_NODELAY should be 0 === w1064_tsign (32 bit report) === ws2_32: sock.c:1315: Test failed: TCP_NODELAY should be 0 === w10pro64 (32 bit report) === ws2_32: sock.c:1297: Test failed: got -1 with 10055 (expected SOCKET_ERROR with WSAEFAULT) sock.c:1315: Test failed: TCP_NODELAY should be 0 === w864 (64 bit report) === ws2_32: sock.c:1315: Test failed: TCP_NODELAY should be 0 === w1064v1507 (64 bit report) === ws2_32: sock.c:1315: Test failed: TCP_NODELAY should be 0 === w1064v1809 (64 bit report) === ws2_32: sock.c:1315: Test failed: TCP_NODELAY should be 0 === w1064 (64 bit report) === ws2_32: sock.c:1315: Test failed: TCP_NODELAY should be 0 === w1064_2qxl (64 bit report) === ws2_32: sock.c:1315: Test failed: TCP_NODELAY should be 0 === w1064_tsign (64 bit report) === ws2_32: sock.c:1315: Test failed: TCP_NODELAY should be 0 === w10pro64 (64 bit report) === ws2_32: sock.c:1297: Test failed: got -1 with 10055 (expected SOCKET_ERROR with WSAEFAULT) sock.c:1315: Test failed: TCP_NODELAY should be 0 === w10pro64_ar (64 bit report) === ws2_32: sock.c:1297: Test failed: got -1 with 10055 (expected SOCKET_ERROR with WSAEFAULT) sock.c:1315: Test failed: TCP_NODELAY should be 0 === w10pro64_he (64 bit report) === ws2_32: sock.c:1297: Test failed: got -1 with 10055 (expected SOCKET_ERROR with WSAEFAULT) sock.c:1315: Test failed: TCP_NODELAY should be 0 === w10pro64_ja (64 bit report) === ws2_32: sock.c:1297: Test failed: got -1 with 10055 (expected SOCKET_ERROR with WSAEFAULT) sock.c:1315: Test failed: TCP_NODELAY should be 0 === w10pro64_zh_CN (64 bit report) === ws2_32: sock.c:1297: Test failed: got -1 with 10055 (expected SOCKET_ERROR with WSAEFAULT) sock.c:1315: Test failed: TCP_NODELAY should be 0
participants (2)
-
Bastien Orivel -
Marvin