Attachment 6814 Details for Bug 8407 – git-am fix for master based on Metze's patch

[patch] git-am fix for master based on Metze's patch

master (text/plain), 5.34 KB, created by Jeremy Allison on 2011-08-26 21:24:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2011-08-26 21:24:32 UTC

Size: 5.34 KB

patch

obsolete

>From 7a2fffa158133fe799931181baf53beeb1f33990 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Thu, 25 Aug 2011 23:33:41 +0200
>Subject: [PATCH 1/2] s3:smb2_server: keep compound_related on struct smbd_smb2_request
>
>metze
>---
> source3/smbd/globals.h     |    1 +
> source3/smbd/smb2_server.c |    7 +++----
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
>index b9bd212..0baf159 100644
>--- a/source3/smbd/globals.h
>+++ b/source3/smbd/globals.h
>@@ -355,6 +355,7 @@ struct smbd_smb2_request {
> 	bool do_signing;
> 	bool async;
> 	bool cancelled;
>+	bool compound_related;
> 
> 	/* fake smb1 request. */
> 	struct smb_request *smb1req;
>diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
>index 6fc4b5d..0310cb1 100644
>--- a/source3/smbd/smb2_server.c
>+++ b/source3/smbd/smb2_server.c
>@@ -360,7 +360,6 @@ static NTSTATUS smbd_smb2_request_validate(struct smbd_smb2_request *req)
> {
> 	int count;
> 	int idx;
>-	bool compound_related = false;
> 
> 	count = req->in.vector_count;
> 
>@@ -408,7 +407,7 @@ static NTSTATUS smbd_smb2_request_validate(struct smbd_smb2_request *req)
> 			 * compounded requests
> 			 */
> 			if (flags & SMB2_HDR_FLAG_CHAINED) {
>-				compound_related = true;
>+				req->compound_related = true;
> 			}
> 		} else if (idx > 4) {
> #if 0
>@@ -421,13 +420,13 @@ static NTSTATUS smbd_smb2_request_validate(struct smbd_smb2_request *req)
> 			 * all other requests should match the 2nd one
> 			 */
> 			if (flags & SMB2_HDR_FLAG_CHAINED) {
>-				if (!compound_related) {
>+				if (!req->compound_related) {
> 					req->next_status =
> 						NT_STATUS_INVALID_PARAMETER;
> 					return NT_STATUS_OK;
> 				}
> 			} else {
>-				if (compound_related) {
>+				if (req->compound_related) {
> 					req->next_status =
> 						NT_STATUS_INVALID_PARAMETER;
> 					return NT_STATUS_OK;
>-- 
>1.7.3.1
>
>
>From 19db1c98c6ba3cb5e883e16e865c44900ce17444 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Fri, 26 Aug 2011 14:23:26 -0700
>Subject: [PATCH 2/2] Based on metze's fix for Bug 8407 - SMB2 server can return requests out-of-order when processing a compound request.
>
>---
> source3/smbd/globals.h     |    1 +
> source3/smbd/smb2_server.c |   40 ++++++++++++++++++++++++++++++++++++++--
> 2 files changed, 39 insertions(+), 2 deletions(-)
>
>diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
>index 0baf159..35c44ee 100644
>--- a/source3/smbd/globals.h
>+++ b/source3/smbd/globals.h
>@@ -606,6 +606,7 @@ struct smbd_server_connection {
> 		uint32_t credits_granted;
> 		uint32_t max_credits;
> 		struct bitmap *credits_bitmap;
>+		bool compound_related_in_progress;
> 	} smb2;
> };
> 
>diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
>index 0310cb1..d29b055 100644
>--- a/source3/smbd/smb2_server.c
>+++ b/source3/smbd/smb2_server.c
>@@ -886,6 +886,20 @@ NTSTATUS smbd_smb2_request_pending_queue(struct smbd_smb2_request *req,
> 		if (!NT_STATUS_IS_OK(status)) {
> 			return status;
> 		}
>+
>+		/*
>+		 * We're splitting off the last SMB2
>+		 * request in a compound set, and the
>+		 * smb2_send_async_interim_response()
>+		 * call above just sent all the replies
>+		 * for the previous SMB2 requests in
>+		 * this compound set. So we're no longer
>+		 * in the "compound_related_in_progress"
>+		 * state, and this is no longer a compound
>+		 * request.
>+		 */
>+		req->compound_related = false;
>+		req->sconn->smb2.compound_related_in_progress = false;
> 	}
> 
> 	/* Don't return an intermediate packet on a pipe read/write. */
>@@ -1305,6 +1319,10 @@ NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req)
> 		req->compat_chain_fsp = NULL;
> 	}
> 
>+	if (req->compound_related) {
>+		req->sconn->smb2.compound_related_in_progress = true;
>+	}
>+
> 	switch (opcode) {
> 	case SMB2_OP_NEGPROT:
> 		/* This call needs to be run as root */
>@@ -1751,6 +1769,10 @@ static NTSTATUS smbd_smb2_request_reply(struct smbd_smb2_request *req)
> 		return NT_STATUS_OK;
> 	}
> 
>+	if (req->compound_related) {
>+		req->sconn->smb2.compound_related_in_progress = false;
>+	}
>+
> 	smb2_setup_nbt_length(req->out.vector, req->out.vector_count);
> 
> 	/* Set credit for this operation (zero credits if this
>@@ -1801,6 +1823,8 @@ static NTSTATUS smbd_smb2_request_reply(struct smbd_smb2_request *req)
> 	return NT_STATUS_OK;
> }
> 
>+static NTSTATUS smbd_smb2_request_next_incoming(struct smbd_server_connection *sconn);
>+
> void smbd_smb2_request_dispatch_immediate(struct tevent_context *ctx,
> 					struct tevent_immediate *im,
> 					void *private_data)
>@@ -1823,9 +1847,13 @@ void smbd_smb2_request_dispatch_immediate(struct tevent_context *ctx,
> 		smbd_server_connection_terminate(sconn, nt_errstr(status));
> 		return;
> 	}
>-}
> 
>-static NTSTATUS smbd_smb2_request_next_incoming(struct smbd_server_connection *sconn);
>+	status = smbd_smb2_request_next_incoming(sconn);
>+	if (!NT_STATUS_IS_OK(status)) {
>+		smbd_server_connection_terminate(sconn, nt_errstr(status));
>+		return;
>+	}
>+}
> 
> static void smbd_smb2_request_writev_done(struct tevent_req *subreq)
> {
>@@ -2464,6 +2492,14 @@ static NTSTATUS smbd_smb2_request_next_incoming(struct smbd_server_connection *s
> 	size_t cur_send_queue_len;
> 	struct tevent_req *subreq;
> 
>+	if (sconn->smb2.compound_related_in_progress) {
>+		/*
>+		 * Can't read another until the related
>+		 * compound is done.
>+		 */
>+		return NT_STATUS_OK;
>+	}
>+
> 	if (tevent_queue_length(sconn->smb2.recv_queue) > 0) {
> 		/*
> 		 * if there is already a smbd_smb2_request_read
>-- 
>1.7.3.1
>

Actions: View

Attachments on bug 8407: 6807 | 6808 | 6809 | 6810 | 6811 | 6812 | 6814 | 6815 | 6855