diff options
| author | Andreas Schneider <asn@samba.org> | 2015-02-16 10:59:23 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2015-02-22 15:02:26 +0100 |
| commit | 3504106c94153a87c5c8e1c0e49f1fff924b0f4d (patch) | |
| tree | 157e11b2953afb3e1ad8db6a5811308850504276 | |
| parent | 4661fa51de4915c96eeb61a74982519076a02c9b (diff) | |
| download | samba-3504106c94153a87c5c8e1c0e49f1fff924b0f4d.tar.gz | |
s3-netlogon: Make sure we do not deference a NULL pointer.
This is an additional patch for CVE-2015-0240.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11077#c32
Pair-Programmed-With: Michael Adam <obnox@samba.org>
Pair-Programmed-With: Andreas Schneider <asn@samba.org>
Signed-off-by: Michael Adam <obnox@samba.org>
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
| -rw-r--r-- | source3/rpc_server/netlogon/srv_netlog_nt.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c index cf7cadac038..060ca0b5078 100644 --- a/source3/rpc_server/netlogon/srv_netlog_nt.c +++ b/source3/rpc_server/netlogon/srv_netlog_nt.c @@ -1222,9 +1222,14 @@ NTSTATUS _netr_ServerPasswordSet(struct pipes_struct *p, unbecome_root(); if (!NT_STATUS_IS_OK(status)) { + const char *computer_name = "<unknown>"; + + if (creds != NULL && creds->computer_name != NULL) { + computer_name = creds->computer_name; + } DEBUG(2,("_netr_ServerPasswordSet: 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; } |