Attachment 5403 Details for Bug 7159 – Should we add a patch like this to master?

[patch] Should we add a patch like this to master?

tmp.diff (text/plain), 1.67 KB, created by Stefan Metzmacher on 2010-02-20 02:13:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2010-02-20 02:13:38 UTC

Size: 1.67 KB

patch

obsolete

>From dcb27c87d2a3903a8d71d5bbc495fe858c1403fc Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Sat, 20 Feb 2010 09:08:16 +0100
>Subject: [PATCH] s3:rpc_transport_np: handle trans rdata like the output of a normal read
>
>metze
>---
> source3/rpc_client/rpc_transport_np.c |   17 +++++++++++++++++
> 1 files changed, 17 insertions(+), 0 deletions(-)
>
>diff --git a/source3/rpc_client/rpc_transport_np.c b/source3/rpc_client/rpc_transport_np.c
>index 623a8b3..de734fe 100644
>--- a/source3/rpc_client/rpc_transport_np.c
>+++ b/source3/rpc_client/rpc_transport_np.c
>@@ -206,6 +206,7 @@ static NTSTATUS rpc_np_read_recv(struct tevent_req *req, ssize_t *preceived)
> 
> struct rpc_np_trans_state {
> 	uint16_t setup[2];
>+	uint32_t max_rdata_len;
> 	uint8_t *rdata;
> 	uint32_t rdata_len;
> };
>@@ -228,6 +229,8 @@ static struct tevent_req *rpc_np_trans_send(TALLOC_CTX *mem_ctx,
> 		return NULL;
> 	}
> 
>+	state->max_rdata_len = max_rdata_len;
>+
> 	SSVAL(state->setup+0, 0, TRANSACT_DCERPCCMD);
> 	SSVAL(state->setup+1, 0, np_transport->fnum);
> 
>@@ -257,10 +260,24 @@ static void rpc_np_trans_done(struct tevent_req *subreq)
> 	status = cli_trans_recv(subreq, state, NULL, 0, NULL, NULL, 0, NULL,
> 				&state->rdata, 0, &state->rdata_len);
> 	TALLOC_FREE(subreq);
>+	if (NT_STATUS_EQUAL(status, NT_STATUS_BUFFER_TOO_SMALL)) {
>+		status = NT_STATUS_OK;
>+	}
> 	if (!NT_STATUS_IS_OK(status)) {
> 		tevent_req_nterror(req, status);
> 		return;
> 	}
>+
>+	if (state->rdata_len > state->max_rdata_len) {
>+		tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
>+		return;
>+	}
>+
>+	if (state->rdata_len == 0) {
>+		tevent_req_nterror(req, NT_STATUS_PIPE_BROKEN);
>+		return;
>+	}
>+
> 	tevent_req_done(req);
> }
> 
>-- 
>1.6.3.3
>

Actions: View

Attachments on bug 7159: 5401 | 5402 | 5403 | 5597