From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Wed, 20 Oct 2021 04:17:50 +0000 (+1300)
Subject: CVE-2020-25722 s4/dsdb/samldb: samldb_group_type_change() checks all values
X-Git-Tag: samba-4.13.14~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=485db903ed2bac1470e00948574b97bd9548cae4;p=thirdparty%2Fsamba.git

CVE-2020-25722 s4/dsdb/samldb: samldb_group_type_change() checks all 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>
---

diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index 48eb88f728b..391437d759d 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -3221,8 +3221,15 @@ static int samldb_group_type_change(struct samldb_ctx *ac)
 	struct ldb_result *res;
 	const char * const attrs[] = { "groupType", NULL };
 
-	el = dsdb_get_single_valued_attr(ac->msg, "groupType",
-					 ac->req->operation);
+	ret = dsdb_get_expected_new_values(ac,
+					   ac->msg,
+					   "groupType",
+					   &el,
+					   ac->req->operation);
+	if (ret != LDB_SUCCESS) {
+		return ret;
+	}
+
 	if (el == NULL) {
 		/* we are not affected */
 		return LDB_SUCCESS;