From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Wed, 20 Oct 2021 04:14:05 +0000 (+1300)
Subject: CVE-2020-25722 s4/dsdb/samldb: samldb_prim_group_change() checks all values
X-Git-Tag: ldb-2.5.0~204
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87382e198f7883dee81ccac769ae54a6700f4f24;p=thirdparty%2Fsamba.git

CVE-2020-25722 s4/dsdb/samldb: samldb_prim_group_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 395c7dafbca..0e8fb284a4c 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -2124,8 +2124,15 @@ static int samldb_prim_group_change(struct samldb_ctx *ac)
 	int ret;
 	const char * const noattrs[] = { NULL };
 
-	el = dsdb_get_single_valued_attr(ac->msg, "primaryGroupID",
-					 ac->req->operation);
+	ret = dsdb_get_expected_new_values(ac,
+					   ac->msg,
+					   "primaryGroupID",
+					   &el,
+					   ac->req->operation);
+	if (ret != LDB_SUCCESS) {
+		return ret;
+	}
+
 	if (el == NULL) {
 		/* we are not affected */
 		return LDB_SUCCESS;