Attachment 11344 Details for Bug 11316 – Patch for v4-3-test

[patch] Patch for v4-3-test

tmp43.diff.txt (text/plain), 1.45 KB, created by Stefan Metzmacher on 2015-08-17 19:56:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2015-08-17 19:56:54 UTC

Size: 1.45 KB

patch

obsolete

>From e48ed55f38042d9d06fd61abc232b6960c064400 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Fri, 14 Aug 2015 12:54:00 +0200
>Subject: [PATCH] s3:lib: fix some corner cases of open_socket_out_cleanup()
>
>In case of timeouts we retry the async_connect_send() and forgot
>to remember it, this results in an abort() in async_connect_cleanup()
>as the fd is already closed when calling fcntl(F_SETFL).
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11316
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>(cherry picked from commit ce3c77fb45ccf4d45a0fa655325e30e748d89245)
>---
> source3/lib/util_sock.c | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
>index a8a9cca..cb57f84 100644
>--- a/source3/lib/util_sock.c
>+++ b/source3/lib/util_sock.c
>@@ -580,6 +580,7 @@ static void open_socket_out_connected(struct tevent_req *subreq)
> 			tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
> 			return;
> 		}
>+		state->connect_subreq = subreq;
> 		tevent_req_set_callback(subreq, open_socket_out_connected, req);
> 		return;
> 	}
>@@ -602,10 +603,12 @@ NTSTATUS open_socket_out_recv(struct tevent_req *req, int *pfd)
> 	NTSTATUS status;
> 
> 	if (tevent_req_is_nterror(req, &status)) {
>+		tevent_req_received(req);
> 		return status;
> 	}
> 	*pfd = state->fd;
> 	state->fd = -1;
>+	tevent_req_received(req);
> 	return NT_STATUS_OK;
> }
> 
>-- 
>1.9.1
>

Flags:

vl: review+
slow: review+

Actions: View

Attachments on bug 11316: 11155 | 11157 | 11161 | 11164 | 11344 | 11345 | 11347 | 11348 | 11480 | 11482 | 11483