50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
From 7913ec038f25b1778dfe545766266c70502e7c63 Mon Sep 17 00:00:00 2001
|
|
From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
|
|
Date: Wed, 20 Oct 2021 17:10:44 +1300
|
|
Subject: [PATCH 158/266] CVE-2020-25722 s4/dsdb/samldb:
|
|
samldb_get_single_valued_attr() check all values
|
|
|
|
using dsdb_get_expected_new_values().
|
|
|
|
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14876
|
|
|
|
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
|
|
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
|
|
|
Conflict:NA
|
|
Reference:https://gitlab.com/samba-team/samba/-/commit/7913ec038f25b1778dfe545766266c70502e7c63
|
|
|
|
---
|
|
source4/dsdb/samdb/ldb_modules/samldb.c | 12 ++++++++++--
|
|
1 file changed, 10 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
|
|
index 006658d2bce..4bd40a5ef1f 100644
|
|
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
|
|
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
|
|
@@ -171,11 +171,19 @@ static int samldb_get_single_valued_attr(struct ldb_context *ldb,
|
|
* attribute.
|
|
*/
|
|
struct ldb_message_element *el = NULL;
|
|
+ int ret;
|
|
|
|
*value = NULL;
|
|
|
|
- el = dsdb_get_single_valued_attr(ac->msg, attr,
|
|
- ac->req->operation);
|
|
+ ret = dsdb_get_expected_new_values(ac,
|
|
+ ac->msg,
|
|
+ attr,
|
|
+ &el,
|
|
+ ac->req->operation);
|
|
+
|
|
+ if (ret != LDB_SUCCESS) {
|
|
+ return ret;
|
|
+ }
|
|
if (el == NULL) {
|
|
/* we are not affected */
|
|
return LDB_SUCCESS;
|
|
--
|
|
2.23.0
|
|
|