44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
From 18e4c639dfca246d198f2407d39ac5b85bb747f9 Mon Sep 17 00:00:00 2001
|
|
From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
|
|
Date: Wed, 20 Oct 2021 17:14:05 +1300
|
|
Subject: [PATCH 162/266] 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>
|
|
|
|
Conflict:NA
|
|
Reference:https://gitlab.com/samba-team/samba/-/commit/18e4c639dfca246d198f2407d39ac5b85bb747f9
|
|
|
|
---
|
|
source4/dsdb/samdb/ldb_modules/samldb.c | 11 +++++++++--
|
|
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
|
|
index 5b2c2fc29aa..ba56cf8826e 100644
|
|
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
|
|
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
|
|
@@ -2121,8 +2121,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;
|
|
--
|
|
2.23.0
|
|
|