From f834213fcbc2f78e856640686450c6c1e01e427e Mon Sep 17 00:00:00 2001 From: Richard Sharpe Date: Tue, 20 Jun 2017 12:40:39 -0700 Subject: [PATCH] Bug 15852. There are valid paths where conn->lsa_pipe_tcp->transport is NULL. Protect against this. Based on a suggestion from Metze. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12852 Signed-off-by: Richard Sharpe Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Thu Jun 22 23:16:46 CEST 2017 on sn-devel-144 (cherry picked from commit 03042b85c8140842633b36f3124e504b97b852a1) --- source3/winbindd/winbindd_cm.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index 686bf9f1742..2cf89edad86 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -2912,10 +2912,12 @@ static NTSTATUS cm_connect_lsa_tcp(struct winbindd_domain *domain, conn = &domain->conn; - if (conn->lsa_pipe_tcp && + /* + * rpccli_is_connected handles more error cases + */ + if (rpccli_is_connected(conn->lsa_pipe_tcp) && conn->lsa_pipe_tcp->transport->transport == NCACN_IP_TCP && - conn->lsa_pipe_tcp->auth->auth_level >= DCERPC_AUTH_LEVEL_INTEGRITY && - rpccli_is_connected(conn->lsa_pipe_tcp)) { + conn->lsa_pipe_tcp->auth->auth_level >= DCERPC_AUTH_LEVEL_INTEGRITY) { goto done; } -- 2.11.0