CVE-2020-25722 s4/dsdb/samldb: samldb_lockout_time() 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 42bd9953837a295690d1b91ed7b9ec6d5dae0a46..898146d49dfb2dfbad4d432aac3f041e00e84786 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -3169,8 +3169,15 @@ static int samldb_lockout_time(struct samldb_ctx *ac)
        struct ldb_message *tmp_msg;
        int ret;
 
-       el = dsdb_get_single_valued_attr(ac->msg, "lockoutTime",
-                                        ac->req->operation);
+       ret = dsdb_get_expected_new_values(ac,
+                                          ac->msg,
+                                          "lockoutTime",
+                                          &el,
+                                          ac->req->operation);
+       if (ret != LDB_SUCCESS) {
+               return ret;
+       }
+
        if (el == NULL || el->num_values == 0) {
                ldb_asprintf_errstring(ldb,
                        "%08X: samldb: 'lockoutTime' can't be deleted!",