smb2_server: call smbXsrv_connection_disconnect_transport() early on network errors

Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index c037f73342fb78fd58902259783b118b18a67795..2149048721a1e93a22b9dc322ff60f7c816289d5 100644 (file)
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -3972,6 +3972,8 @@ static NTSTATUS smbd_smb2_flush_send_queue(struct smbXsrv_connection *xconn)
                        talloc_free(e->mem_ctx);
 
                        if (!NT_STATUS_IS_OK(status)) {
+                               smbXsrv_connection_disconnect_transport(xconn,
+                                                                       status);
                                return status;
                        }
                        continue;
@@ -3989,7 +3991,10 @@ static NTSTATUS smbd_smb2_flush_send_queue(struct smbXsrv_connection *xconn)
                        return NT_STATUS_OK;
                }
                if (err != 0) {
-                       return map_nt_error_from_unix_common(err);
+                       status = map_nt_error_from_unix_common(err);
+                       smbXsrv_connection_disconnect_transport(xconn,
+                                                               status);
+                       return status;
                }
 
                ok = iov_advance(&e->vector, &e->count, ret);
@@ -4070,7 +4075,10 @@ again:
        ret = readv(xconn->transport.sock, &state->vector, 1);
        if (ret == 0) {
                /* propagate end of file */
-               return NT_STATUS_END_OF_FILE;
+               status = NT_STATUS_END_OF_FILE;
+               smbXsrv_connection_disconnect_transport(xconn,
+                                                       status);
+               return status;
        }
        err = socket_error_from_errno(ret, errno, &retry);
        if (retry) {
@@ -4079,7 +4087,10 @@ again:
                return NT_STATUS_OK;
        }
        if (err != 0) {
-               return map_nt_error_from_unix_common(err);
+               status = map_nt_error_from_unix_common(err);
+               smbXsrv_connection_disconnect_transport(xconn,
+                                                       status);
+               return status;
        }
 
        if (ret < state->vector.iov_len) {