Attachment 7060 Details for Bug 8562 – git-am fix for 3.6.2.

[patch] git-am fix for 3.6.2.

0001-Fix-bug-8562-talloc-double-free-error.patch (text/plain), 2.12 KB, created by Jeremy Allison on 2011-11-03 23:22:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2011-11-03 23:22:06 UTC

Size: 2.12 KB

patch

obsolete

>From 5c8290d37b93d408127289537f9cfa4a98ecc4f5 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Thu, 3 Nov 2011 14:30:11 -0700
>Subject: [PATCH] Fix bug #8562 - talloc: double free error.
>
>Ensure we don't access an undefined pointer.
>
>Autobuild-User: Jeremy Allison <jra@samba.org>
>Autobuild-Date: Fri Nov  4 00:09:46 CET 2011 on sn-devel-104
>(cherry picked from commit 767c54d8dd9596718579699398392ae234b40aa2)
>---
> source3/rpc_server/netlogon/srv_netlog_nt.c |   11 +++++++++--
> 1 files changed, 9 insertions(+), 2 deletions(-)
>
>diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c
>index ecdfac7..3fd93bc 100644
>--- a/source3/rpc_server/netlogon/srv_netlog_nt.c
>+++ b/source3/rpc_server/netlogon/srv_netlog_nt.c
>@@ -1251,7 +1251,7 @@ NTSTATUS _netr_ServerPasswordSet2(struct pipes_struct *p,
> 				  struct netr_ServerPasswordSet2 *r)
> {
> 	NTSTATUS status;
>-	struct netlogon_creds_CredentialState *creds;
>+	struct netlogon_creds_CredentialState *creds = NULL;
> 	DATA_BLOB plaintext;
> 	struct samr_CryptPassword password_buf;
> 	struct samr_Password nt_hash;
>@@ -1265,9 +1265,14 @@ NTSTATUS _netr_ServerPasswordSet2(struct pipes_struct *p,
> 	unbecome_root();
> 
> 	if (!NT_STATUS_IS_OK(status)) {
>+		const char *computer_name = "<unknown>";
>+
>+		if (creds && creds->computer_name) {
>+			computer_name = creds->computer_name;
>+		}
> 		DEBUG(2,("_netr_ServerPasswordSet2: netlogon_creds_server_step "
> 			"failed. Rejecting auth request from client %s machine account %s\n",
>-			r->in.computer_name, creds->computer_name));
>+			r->in.computer_name, computer_name));
> 		TALLOC_FREE(creds);
> 		return status;
> 	}
>@@ -1277,6 +1282,7 @@ NTSTATUS _netr_ServerPasswordSet2(struct pipes_struct *p,
> 	netlogon_creds_arcfour_crypt(creds, password_buf.data, 516);
> 
> 	if (!extract_pw_from_buffer(p->mem_ctx, password_buf.data, &plaintext)) {
>+		TALLOC_FREE(creds);
> 		return NT_STATUS_WRONG_PASSWORD;
> 	}
> 
>@@ -1287,6 +1293,7 @@ NTSTATUS _netr_ServerPasswordSet2(struct pipes_struct *p,
> 						   p->msg_ctx,
> 						   creds->account_name,
> 						   &nt_hash);
>+	TALLOC_FREE(creds);
> 	return status;
> }
> 
>-- 
>1.7.3.1
>

Flags:

metze: review+

Actions: View

Attachments on bug 8562: 7048 | 7060