From c977ee5887cc1c66da69e71850363703ec39b05e Mon Sep 17 00:00:00 2001 From: Noel Power Date: Mon, 2 Nov 2015 09:59:12 +0000 Subject: [PATCH 1/2] s3: rpcclient: Prevent null ptr access by returning error if no creds available Prevent rpccli_netlogon_password_logon being called with 'NULL' credentials. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11569 Signed-off-by: Noel Power Reviewed-by: Jeremy Allison Reviewed-by: Stefan Metzmacher (cherry picked from commit 89940f39c6d2db03b3a468942d686e762f126f9f) --- source3/rpcclient/cmd_netlogon.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c index 0a8ab20..744361c 100644 --- a/source3/rpcclient/cmd_netlogon.c +++ b/source3/rpcclient/cmd_netlogon.c @@ -800,6 +800,11 @@ static NTSTATUS cmd_netlogon_sam_logon(struct rpc_pipe_client *cli, if (argc == 6) sscanf(argv[5], "%x", &logon_param); + if (rpcclient_netlogon_creds == NULL) { + result = NT_STATUS_UNSUCCESSFUL; + goto done; + } + /* Perform the sam logon */ result = rpccli_netlogon_password_logon(rpcclient_netlogon_creds, -- 2.1.4