Paul Gofman : ws2_32: Manage shorter length for SO_LINGER.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8a851dd75caceafad02b569909f23a9ad45b53fd
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8a851dd75caceafad02b569909f23a9ad45b53fd

Author: Paul Gofman <pgofman at codeweavers.com>
Date:   Wed Mar  9 11:59:42 2022 +0300

ws2_32: Manage shorter length for SO_LINGER.

Signed-off-by: Paul Gofman <pgofman at codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ws2_32/socket.c     | 8 +++++++-
 dlls/ws2_32/tests/sock.c | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 1a0d28c484e..342c3803c67 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -1541,7 +1541,8 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl
             /* struct linger and LINGER have different sizes */
             if (*optlen < sizeof(LINGER) || !optval)
             {
-                SetLastError(WSAEFAULT);
+                if (optval) memset( optval, 0, *optlen );
+                SetLastError( WSAEFAULT );
                 return SOCKET_ERROR;
             }
 
@@ -2842,6 +2843,11 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int
             return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_KEEPALIVE, (char *)&value, sizeof(value) );
 
         case SO_LINGER:
+            if (optlen < sizeof(LINGER) || !optval)
+            {
+                SetLastError( WSAEFAULT );
+                return SOCKET_ERROR;
+            }
             return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_LINGER, optval, optlen );
 
         case SO_OOBINLINE:
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index a6505134d44..ccc1cca06db 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_LINGER, FALSE, {1, 2, 4}, {0xdeadbe00, 0xdead0000}, 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},