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 395c7dafbca6009d99031ce6904f5b5fbc9a19f6..0e8fb284a4c0c9155c9a7565f555b0349758bfce 100644 (file)
--- 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;