From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 11 Sep 2020 12:12:17 +0000 (+0200)
Subject: CVE-2020-25717 winbindd: assert wb_parent_idmap_setup_send/recv() was called before... 
X-Git-Tag: samba-4.13.14~253
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be81631363655e3437cae4303ab39c22500165fd;p=thirdparty%2Fsamba.git

CVE-2020-25717 winbindd: assert wb_parent_idmap_setup_send/recv() was called before idmap_child_handle()

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14539

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14556

(cherry picked from commit b8c74b7b46d1c7f6b66e565ee08f8c88d6dc2cc4)
---

diff --git a/source3/winbindd/winbindd_idmap.c b/source3/winbindd/winbindd_idmap.c
index 487f27fd94d..14836e3b8a0 100644
--- a/source3/winbindd/winbindd_idmap.c
+++ b/source3/winbindd/winbindd_idmap.c
@@ -59,6 +59,11 @@ pid_t idmap_child_pid(void)
 
 struct dcerpc_binding_handle *idmap_child_handle(void)
 {
+	/*
+	 * The caller needs to use wb_parent_idmap_setup_send/recv
+	 * before talking to the idmap child!
+	 */
+	SMB_ASSERT(static_parent_idmap_config.num_doms > 0);
 	return static_idmap_child.binding_handle;
 }