sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

CVE-2023-0614 ldb: Add functions for handling inaccessible message elements

Browse Source 
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>
This commit is contained in:
Joseph Sutton 2023-01-27 08:28:36 +13:00 committed by Andrew Bartlett
parent 17feef18bf
commit ca9c467e41
3 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ldb/ABI/ldb-2.8.0.sigs
View File

@ -174,6 +174,8 @@ ldb_msg_element_add_value: int (TALLOC_CTX *, struct ldb_message_element *, cons
ldb_msg_element_compare: int (struct ldb_message_element *, struct ldb_message_element *)
ldb_msg_element_compare_name: int (struct ldb_message_element *, struct ldb_message_element *)
ldb_msg_element_equal_ordered: bool (const struct ldb_message_element *, const struct ldb_message_element *)
ldb_msg_element_is_inaccessible: bool (const struct ldb_message_element *)
ldb_msg_element_mark_inaccessible: void (struct ldb_message_element *)
ldb_msg_find_attr_as_bool: int (const struct ldb_message *, const char *, int)
ldb_msg_find_attr_as_dn: struct ldb_dn *(struct ldb_context *, TALLOC_CTX *, const struct ldb_message *, const char *)
ldb_msg_find_attr_as_double: double (const struct ldb_message *, const char *, double)
@ -191,6 +193,7 @@ ldb_msg_new: struct ldb_message *(TALLOC_CTX *)
ldb_msg_normalize: int (struct ldb_context *, TALLOC_CTX *, const struct ldb_message *, struct ldb_message **)
ldb_msg_remove_attr: void (struct ldb_message *, const char *)
ldb_msg_remove_element: void (struct ldb_message *, struct ldb_message_element *)
ldb_msg_remove_inaccessible: void (struct ldb_message *)
ldb_msg_rename_attr: int (struct ldb_message *, const char *, const char *)
ldb_msg_sanity_check: int (struct ldb_context *, const struct ldb_message *)
ldb_msg_sort_elements: void (struct ldb_message *)

26
lib/ldb/common/ldb_msg.c
View File

@ -795,6 +795,32 @@ int ldb_msg_element_compare_name(struct ldb_message_element *el1,
return ldb_attr_cmp(el1->name, el2->name);
}
void ldb_msg_element_mark_inaccessible(struct ldb_message_element *el)
{
el->flags |= LDB_FLAG_INTERNAL_INACCESSIBLE_ATTRIBUTE;
}
bool ldb_msg_element_is_inaccessible(const struct ldb_message_element *el)
{
return (el->flags & LDB_FLAG_INTERNAL_INACCESSIBLE_ATTRIBUTE) != 0;
}
void ldb_msg_remove_inaccessible(struct ldb_message *msg)
{
unsigned i;
unsigned num_del = 0;
for (i = 0; i < msg->num_elements; ++i) {
if (ldb_msg_element_is_inaccessible(&msg->elements[i])) {
++num_del;
} else if (num_del) {
msg->elements[i - num_del] = msg->elements[i];
}
}
msg->num_elements -= num_del;
}
/*
convenience functions to return common types from a message
these return the first value if the attribute is multi-valued

4
lib/ldb/include/ldb_module.h
View File

@ -513,6 +513,10 @@ struct ldb_extended_match_rule
int ldb_register_extended_match_rule(struct ldb_context *ldb,
const struct ldb_extended_match_rule *rule);
void ldb_msg_element_mark_inaccessible(struct ldb_message_element *el);
bool ldb_msg_element_is_inaccessible(const struct ldb_message_element *el);
void ldb_msg_remove_inaccessible(struct ldb_message *msg);
/*
* these pack/unpack functions are exposed in the library for use by
* ldb tools like ldbdump and for use in tests,