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 9a8c1bfaa9760f43f5e73c4147f2df026d9522ec..60e5500ee75984dc574f533b85aed4ccb4f03dae 100644 (file)
--- a/source4/smb_server/smb2/sesssetup.c
+++ b/source4/smb_server/smb2/sesssetup.c
@@ -19,16 +19,15 @@
 */
 
 #include "includes.h"
-#include "auth/credentials/credentials.h"
+#include <tevent.h>
 #include "auth/gensec/gensec.h"
 #include "auth/auth.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 #include "smb_server/smb_server.h"
-#include "smb_server/service_smb_proto.h"
 #include "smb_server/smb2/smb2_server.h"
 #include "smbd/service_stream.h"
-#include "param/param.h"
+#include "lib/stream/packet.h"
 
 static void smb2srv_sesssetup_send(struct smb2srv_request *req, union smb_sesssetup *io)
 {
@@ -60,9 +59,9 @@ struct smb2srv_sesssetup_callback_ctx {
        struct smbsrv_session *smb_sess;
 };
 
-static void smb2srv_sesssetup_callback(struct gensec_update_request *greq, void *private_data)
+static void smb2srv_sesssetup_callback(struct tevent_req *subreq)
 {
-       struct smb2srv_sesssetup_callback_ctx *ctx = talloc_get_type(private_data,
+       struct smb2srv_sesssetup_callback_ctx *ctx = tevent_req_callback_data(subreq,
                                                     struct smb2srv_sesssetup_callback_ctx);
        struct smb2srv_request *req = ctx->req;
        union smb_sesssetup *io = ctx->io;
@@ -70,14 +69,17 @@ static void smb2srv_sesssetup_callback(struct gensec_update_request *greq, void
        struct auth_session_info *session_info = NULL;
        NTSTATUS status;
 
-       status = gensec_update_recv(greq, req, &io->smb2.out.secblob);
+       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)) {
                goto done;
        } else if (!NT_STATUS_IS_OK(status)) {
                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;
        }
@@ -97,7 +99,7 @@ static void smb2srv_sesssetup_callback(struct gensec_update_request *greq, void
 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)) {
@@ -111,6 +113,7 @@ static void smb2srv_sesssetup_backend(struct smb2srv_request *req, union smb_ses
        struct smb2srv_sesssetup_callback_ctx *callback_ctx;
        struct smbsrv_session *smb_sess = NULL;
        uint64_t vuid;
+       struct tevent_req *subreq;
 
        io->smb2.out.session_flags = 0;
        io->smb2.out.uid        = 0;
@@ -177,8 +180,12 @@ static void smb2srv_sesssetup_backend(struct smb2srv_request *req, union smb_ses
        callback_ctx->io        = io;
        callback_ctx->smb_sess  = smb_sess;
 
-       gensec_update_send(smb_sess->gensec_ctx, io->smb2.in.secblob,
-                          smb2srv_sesssetup_callback, callback_ctx);
+       subreq = gensec_update_send(callback_ctx,
+                                   req->smb_conn->connection->event.ctx,
+                                   smb_sess->gensec_ctx,
+                                   io->smb2.in.secblob);
+       if (!subreq) goto nomem;
+       tevent_req_set_callback(subreq, smb2srv_sesssetup_callback, callback_ctx);
 
        /* note that we ignore SMB2_NEGOTIATE_SIGNING_ENABLED from the client.
           This is deliberate as windows does not set it even when it does 
@@ -195,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);
 }