CVE-2020-25722 s4/dsdb/samldb: samldb_schema_add_handle_mapiid() 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 39533266aeb6c4fb1f1ceb351c272a80acfc9721..5b2c2fc29aa92ad1359425ed63a0078c4de02a38 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -907,8 +907,15 @@ static int samldb_schema_add_handle_mapiid(struct samldb_ctx *ac)
        schema = dsdb_get_schema(ldb, ac);
        schema_dn = ldb_get_schema_basedn(ldb);
 
-       el = dsdb_get_single_valued_attr(ac->msg, "mAPIID",
-                                        ac->req->operation);
+       ret = dsdb_get_expected_new_values(ac,
+                                          ac->msg,
+                                          "mAPIID",
+                                          &el,
+                                          ac->req->operation);
+       if (ret != LDB_SUCCESS) {
+               return ret;
+       }
+
        if (el == NULL) {
                return LDB_SUCCESS;
        }