40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
From f1995ad41d01134a5169bd24b67881e69ec28ece Mon Sep 17 00:00:00 2001
|
|
From: Joseph Sutton <josephsutton@catalyst.net.nz>
|
|
Date: Wed, 16 Feb 2022 17:03:10 +1300
|
|
Subject: [PATCH 15/18] CVE-2022-32745 s4/dsdb/samldb: Check for empty values
|
|
array
|
|
|
|
This avoids potentially trying to access the first element of an empty
|
|
array.
|
|
|
|
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15008
|
|
|
|
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
|
|
---
|
|
source4/dsdb/samdb/ldb_modules/samldb.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
|
|
index abb96d3bef8..5649a301cd4 100644
|
|
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
|
|
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
|
|
@@ -748,7 +748,7 @@ static int samldb_schema_add_handle_linkid(struct samldb_ctx *ac)
|
|
return ret;
|
|
}
|
|
|
|
- if (el == NULL) {
|
|
+ if (el == NULL || el->num_values == 0) {
|
|
return LDB_SUCCESS;
|
|
}
|
|
|
|
@@ -916,7 +916,7 @@ static int samldb_schema_add_handle_mapiid(struct samldb_ctx *ac)
|
|
return ret;
|
|
}
|
|
|
|
- if (el == NULL) {
|
|
+ if (el == NULL || el->num_values == 0) {
|
|
return LDB_SUCCESS;
|
|
}
|
|
|
|
--
|
|
2.35.0
|