extmod/modssl_mbedtls: Fix ioctl of a socket in closed/error state.

dpgeorge · dpgeorge · commit d529c2067413 · 2023-08-09T13:22:57.000+10:00
Signed-off-by: Damien George &lt;damien@micropython.org&gt;
diff --git a/extmod/modssl_mbedtls.c b/extmod/modssl_mbedtls.c
@@ -486,15 +486,20 @@ STATIC mp_uint_t socket_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, i
     mp_uint_t ret = 0;
     uintptr_t saved_arg = 0;
     mp_obj_t sock = self->sock;
-    if (sock == MP_OBJ_NULL || (request != MP_STREAM_CLOSE && self->last_error != 0)) {
-        // Closed or error socket:
-        return MP_STREAM_POLL_NVAL;
-    }
 
     if (request == MP_STREAM_CLOSE) {
+        if (sock == MP_OBJ_NULL) {
+            // Already closed socket, do nothing.
+            return 0;
+        }
         self->sock = MP_OBJ_NULL;
         mbedtls_ssl_free(&self->ssl);
     } else if (request == MP_STREAM_POLL) {
+        if (sock == MP_OBJ_NULL || self->last_error != 0) {
+            // Closed or error socket, return NVAL flag.
+            return MP_STREAM_POLL_NVAL;
+        }
+
         // If the library signaled us that it needs reading or writing, only check that direction,
         // but save what the caller asked because we need to restore it later
         if (self->poll_mask && (arg & MP_STREAM_POLL_RDWR)) {
diff --git a/tests/extmod/ssl_ioctl.py.exp b/tests/extmod/ssl_ioctl.py.exp
@@ -3,4 +3,4 @@
 10 OSError
 4 0
 3 32
-4 32
+4 0

-Original file line number
+Diff line change
 OSError
 0
 32
 -4 32
 +4 0