summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>2019-05-03 17:27:51 +1200
committerKarolin Seeger <kseeger@samba.org>2019-10-24 11:45:18 +0200
commitda8f00d1be85002d0c8e05573035f65398b4a894 (patch)
tree66ee89d2fe4b434518ff264906962019727e9a5c
parentd58567ee7338dcd9688e9a059ec6a32519625548 (diff)
downloadsamba-da8f00d1be85002d0c8e05573035f65398b4a894.tar.gz
CVE-2019-14847 dsdb/modules/dirsync: ensure attrs exist (CID 1107212)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14040 Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Gary Lockyer <gary@catalyst.net.nz> (cherry picked from commit 23f72c4d712f8d1fec3d67a66d477709d5b0abe2)
-rw-r--r--source4/dsdb/samdb/ldb_modules/dirsync.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/dirsync.c b/source4/dsdb/samdb/ldb_modules/dirsync.c
index 2a9895ae641..fe9e81f15a3 100644
--- a/source4/dsdb/samdb/ldb_modules/dirsync.c
+++ b/source4/dsdb/samdb/ldb_modules/dirsync.c
@@ -343,6 +343,10 @@ skip:
attr = dsdb_attribute_by_lDAPDisplayName(dsc->schema,
el->name);
+ if (attr == NULL) {
+ continue;
+ }
+
keep = false;
if (attr->linkID & 1) {