From: Richard Levitte <levitte@openssl.org>
Date: Thu, 28 Apr 2016 11:19:38 +0000 (+0200)
Subject: Make BIO_sock_error return a proper error code when getsockopt fails
X-Git-Tag: OpenSSL_1_1_0-pre6~1038
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2bd8c8539595b8708e825d306a45ddddc17c915c;p=oweals%2Fopenssl.git

Make BIO_sock_error return a proper error code when getsockopt fails

BIO_sock_error() returned 1 when getsockopt() fails when it should
return the error code for that failure.

Additionally, the optlen parameter to getsockopt() has to point at
the size of the area that the optval parameter points at rather than
zero.  Some systems may forgive it being zero, but others don't.

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index a2d0100bb3..071acda48e 100644
--- a/crypto/bio/b_sock.c
+++ b/crypto/bio/b_sock.c
@@ -141,7 +141,7 @@ int BIO_get_port(const char *str, unsigned short *port_ptr)
 int BIO_sock_error(int sock)
 {
     int j = 0, i;
-    socklen_t size = 0;
+    socklen_t size = sizeof(j);
 
     /*
      * Note: under Windows the third parameter is of type (char *) whereas
@@ -151,7 +151,7 @@ int BIO_sock_error(int sock)
      */
     i = getsockopt(sock, SOL_SOCKET, SO_ERROR, (void *)&j, &size);
     if (i < 0)
-        return (1);
+        return (get_last_socket_error());
     else
         return (j);
 }