gensec: clarify memory ownership for gensec_session_info() and gensec_session_key()

[ira/wip.git] / source4 / smb_server / smb2 / sesssetup.c

diff --git a/source4/smb_server/smb2/sesssetup.c b/source4/smb_server/smb2/sesssetup.c
index 9b601d17c00c9417eb0e5f2f4fe2fd0570200b8b..60e5500ee75984dc574f533b85aed4ccb4f03dae 100644 (file)
--- a/source4/smb_server/smb2/sesssetup.c
+++ b/source4/smb_server/smb2/sesssetup.c
@@ -27,6 +27,7 @@
 #include "smb_server/smb_server.h"
 #include "smb_server/smb2/smb2_server.h"
 #include "smbd/service_stream.h"
+#include "lib/stream/packet.h"
 
 static void smb2srv_sesssetup_send(struct smb2srv_request *req, union smb_sesssetup *io)
 {
@@ -68,6 +69,8 @@ static void smb2srv_sesssetup_callback(struct tevent_req *subreq)
        struct auth_session_info *session_info = NULL;
        NTSTATUS status;
 
+       packet_recv_enable(req->smb_conn->packet);
+
        status = gensec_update_recv(subreq, req, &io->smb2.out.secblob);
        TALLOC_FREE(subreq);
        if (NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
@@ -76,7 +79,7 @@ static void smb2srv_sesssetup_callback(struct tevent_req *subreq)
                goto failed;
        }
 
-       status = gensec_session_info(smb_sess->gensec_ctx, &session_info);
+       status = gensec_session_info(smb_sess->gensec_ctx, smb_sess, &session_info);
        if (!NT_STATUS_IS_OK(status)) {
                goto failed;
        }
@@ -96,7 +99,7 @@ static void smb2srv_sesssetup_callback(struct tevent_req *subreq)
 done:
        io->smb2.out.uid = smb_sess->vuid;
 failed:
-       req->status = auth_nt_status_squash(status);
+       req->status = nt_status_squash(status);
        smb2srv_sesssetup_send(req, io);
        if (!NT_STATUS_IS_OK(status) && !
            NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
@@ -199,12 +202,18 @@ static void smb2srv_sesssetup_backend(struct smb2srv_request *req, union smb_ses
                goto failed;
        }
 
+       /* disable receipt of more packets on this socket until we've
+          finished with the session setup. This avoids a problem with
+          crashes if we get EOF on the socket while processing a session
+          setup */
+       packet_recv_disable(req->smb_conn->packet);
+
        return;
 nomem:
        status = NT_STATUS_NO_MEMORY;
 failed:
        talloc_free(smb_sess);
-       req->status = auth_nt_status_squash(status);
+       req->status = nt_status_squash(status);
        smb2srv_sesssetup_send(req, io);
 }