Attachment 11216 Details for Bug 11329 – Patches for v4-2-test

[patch] Patches for v4-2-test

tmp42.diff.txt (text/plain), 1.55 KB, created by Stefan Metzmacher on 2015-06-30 08:22:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2015-06-30 08:22:58 UTC

Size: 1.55 KB

patch

obsolete

>From f1b7d4df06636679ff78807001d73f7c2c516e6a Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Mon, 15 Jun 2015 08:34:12 +0200
>Subject: [PATCH] s3:smb2_setinfo: fix memory leak in the defer_rename case
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11329
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>(cherry picked from commit bcb69499e1a9312ea3ee32561fdecb2b22835e77)
>---
> source3/smbd/smb2_setinfo.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
>diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c
>index e6981d1..3e15178 100644
>--- a/source3/smbd/smb2_setinfo.c
>+++ b/source3/smbd/smb2_setinfo.c
>@@ -168,6 +168,12 @@ struct defer_rename_state {
> 	int data_size;
> };
> 
>+static int defer_rename_state_destructor(struct defer_rename_state *rename_state)
>+{
>+	SAFE_FREE(rename_state->data);
>+	return 0;
>+}
>+
> static void defer_rename_done(struct tevent_req *subreq);
> 
> static struct tevent_req *delay_rename_for_lease_break(struct tevent_req *req,
>@@ -240,6 +246,8 @@ static struct tevent_req *delay_rename_for_lease_break(struct tevent_req *req,
> 	rename_state->data = data;
> 	rename_state->data_size = data_size;
> 
>+	talloc_set_destructor(rename_state, defer_rename_state_destructor);
>+
> 	subreq = dbwrap_record_watch_send(
> 				rename_state,
> 				ev,
>@@ -312,6 +320,7 @@ static void defer_rename_done(struct tevent_req *subreq)
> 				state->data_size);
> 	if (subreq) {
> 		/* Yep - keep waiting. */
>+		state->data = NULL;
> 		TALLOC_FREE(state);
> 		TALLOC_FREE(lck);
> 		return;
>-- 
>1.9.1
>

Flags:

jra: review+

Actions: View

Attachments on bug 11329: 11216