From 44489d174a64c3e0ff0133752a3cedb7f7139b49 Mon Sep 17 00:00:00 2001 From: Jeremy Allison 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 Autobuild-Date: Fri Nov 4 00:09:46 CET 2011 on sn-devel-104 (cherry picked from commit 767c54d8dd9596718579699398392ae234b40aa2) (cherry picked from commit 5935630fcd15e2618b854fa3c78f3e500690cf35) --- source3/rpc_server/netlogon/srv_netlog_nt.c | 11 +++++++++-- 1 file 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 ecdfac707b3..3fd93bcb280 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 = ""; + + 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; } -- 2.11.4.GIT