63 lines
1.8 KiB
Diff
63 lines
1.8 KiB
Diff
From a9b625bc8ab00b83b55bcd21ba0df48e73e4df29 Mon Sep 17 00:00:00 2001
|
|
From: Joseph Sutton <josephsutton@catalyst.net.nz>
|
|
Date: Fri, 3 Mar 2023 17:26:04 +1300
|
|
Subject: [PATCH 10/34] CVE-2023-0614 ldb: Add function to remove excess
|
|
capacity from an ldb message
|
|
|
|
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15270
|
|
|
|
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
|
|
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
|
|
|
[abartlet@samba.org Adapted to conflict from lack of new
|
|
ldb_ascii_toupper() in ldb_private.h]
|
|
|
|
Conflict: NA
|
|
Reference: https://attachments.samba.org/attachment.cgi?id=17821
|
|
---
|
|
common/ldb_msg.c | 16 ++++++++++++++++
|
|
include/ldb_private.h | 3 +++
|
|
2 files changed, 19 insertions(+)
|
|
|
|
diff --git a/common/ldb_msg.c b/common/ldb_msg.c
|
|
index cbc7e32b2ba..2ea2cce2e83 100644
|
|
--- a/common/ldb_msg.c
|
|
+++ b/common/ldb_msg.c
|
|
@@ -1497,6 +1497,22 @@ void ldb_msg_remove_attr(struct ldb_message *msg, const char *attr)
|
|
}
|
|
}
|
|
|
|
+/* Reallocate elements to drop any excess capacity. */
|
|
+void ldb_msg_shrink_to_fit(struct ldb_message *msg)
|
|
+{
|
|
+ if (msg->num_elements > 0) {
|
|
+ struct ldb_message_element *elements = talloc_realloc(msg,
|
|
+ msg->elements,
|
|
+ struct ldb_message_element,
|
|
+ msg->num_elements);
|
|
+ if (elements != NULL) {
|
|
+ msg->elements = elements;
|
|
+ }
|
|
+ } else {
|
|
+ TALLOC_FREE(msg->elements);
|
|
+ }
|
|
+}
|
|
+
|
|
/*
|
|
return a LDAP formatted GeneralizedTime string
|
|
*/
|
|
diff --git a/include/ldb_private.h b/include/ldb_private.h
|
|
index 4deb24691ca..338e71def6d 100644
|
|
--- a/include/ldb_private.h
|
|
+++ b/include/ldb_private.h
|
|
@@ -317,4 +317,7 @@ int ldb_match_message(struct ldb_context *ldb,
|
|
const struct ldb_parse_tree *tree,
|
|
enum ldb_scope scope, bool *matched);
|
|
|
|
+/* Reallocate elements to drop any excess capacity. */
|
|
+void ldb_msg_shrink_to_fit(struct ldb_message *msg);
|
|
+
|
|
#endif
|
|
--
|
|
2.25.1
|