34 lines
1017 B
Diff
34 lines
1017 B
Diff
From ea39bdd6293041af668f1bfdfea39a725733bad3 Mon Sep 17 00:00:00 2001
|
|
From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
|
|
Date: Fri, 3 May 2019 17:27:51 +1200
|
|
Subject: [PATCH 5/7] 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)
|
|
---
|
|
source4/dsdb/samdb/ldb_modules/dirsync.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/source4/dsdb/samdb/ldb_modules/dirsync.c b/source4/dsdb/samdb/ldb_modules/dirsync.c
|
|
index b5510eccd24..62a66fef8d4 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) {
|
|
--
|
|
2.17.1
|
|
|