From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Thu, 23 Apr 2020 03:31:13 +0000 (+1200)
Subject: dsdb/mod/acl_util: do not deref NULL sd_flags control
X-Git-Tag: ldb-2.2.0~121
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f6c8a75e604f80234ae7fe3edfd655cc8fe59c7;p=thirdparty%2Fsamba.git

dsdb/mod/acl_util: do not deref NULL sd_flags control

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source4/dsdb/samdb/ldb_modules/acl_util.c b/source4/dsdb/samdb/ldb_modules/acl_util.c
index b9931795e19..f917d99517a 100644
--- a/source4/dsdb/samdb/ldb_modules/acl_util.c
+++ b/source4/dsdb/samdb/ldb_modules/acl_util.c
@@ -257,7 +257,7 @@ uint32_t dsdb_request_sd_flags(struct ldb_request *req, bool *explicit)
 	}
 
 	sd_control = ldb_request_get_control(req, LDB_CONTROL_SD_FLAGS_OID);
-	if (sd_control) {
+	if (sd_control != NULL && sd_control->data != NULL) {
 		struct ldb_sd_flags_control *sdctr = (struct ldb_sd_flags_control *)sd_control->data;
 
 		sd_flags = sdctr->secinfo_flags;