67 lines
1.9 KiB
Diff
67 lines
1.9 KiB
Diff
From b23fb132e63a6d3d791469614593c43906686ac9 Mon Sep 17 00:00:00 2001
|
|
From: Joseph Sutton <josephsutton@catalyst.net.nz>
|
|
Date: Fri, 3 Mar 2023 17:31:54 +1300
|
|
Subject: [PATCH 20/34] CVE-2023-0614 ldb: Add ldb_parse_tree_get_attr()
|
|
|
|
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>
|
|
|
|
Conflict: NA
|
|
Reference: https://attachments.samba.org/attachment.cgi?id=17821
|
|
---
|
|
common/ldb_parse.c | 25 +++++++++++++++++++++++++
|
|
include/ldb_module.h | 3 +++
|
|
2 files changed, 28 insertions(+)
|
|
|
|
diff --git a/common/ldb_parse.c b/common/ldb_parse.c
|
|
index f0045ad2093..2d102ff750e 100644
|
|
--- a/common/ldb_parse.c
|
|
+++ b/common/ldb_parse.c
|
|
@@ -997,3 +997,28 @@ struct ldb_parse_tree *ldb_parse_tree_copy_shallow(TALLOC_CTX *mem_ctx,
|
|
|
|
return nt;
|
|
}
|
|
+
|
|
+/* Get the attribute (if any) associated with the top node of a parse tree. */
|
|
+const char *ldb_parse_tree_get_attr(const struct ldb_parse_tree *tree)
|
|
+{
|
|
+ switch (tree->operation) {
|
|
+ case LDB_OP_AND:
|
|
+ case LDB_OP_OR:
|
|
+ case LDB_OP_NOT:
|
|
+ return NULL;
|
|
+ case LDB_OP_EQUALITY:
|
|
+ return tree->u.equality.attr;
|
|
+ case LDB_OP_SUBSTRING:
|
|
+ return tree->u.substring.attr;
|
|
+ case LDB_OP_GREATER:
|
|
+ case LDB_OP_LESS:
|
|
+ case LDB_OP_APPROX:
|
|
+ return tree->u.comparison.attr;
|
|
+ case LDB_OP_PRESENT:
|
|
+ return tree->u.present.attr;
|
|
+ case LDB_OP_EXTENDED:
|
|
+ return tree->u.extended.attr;
|
|
+ }
|
|
+
|
|
+ return NULL;
|
|
+}
|
|
diff --git a/include/ldb_module.h b/include/ldb_module.h
|
|
index 4ae381ba5be..bd369ed9512 100644
|
|
--- a/include/ldb_module.h
|
|
+++ b/include/ldb_module.h
|
|
@@ -490,6 +490,9 @@ int ldb_init_module(const char *version);
|
|
*/
|
|
bool ldb_dn_replace_components(struct ldb_dn *dn, struct ldb_dn *new_dn);
|
|
|
|
+/* Get the attribute (if any) associated with the top node of a parse tree. */
|
|
+const char *ldb_parse_tree_get_attr(const struct ldb_parse_tree *tree);
|
|
+
|
|
/*
|
|
walk a parse tree, calling the provided callback on each node
|
|
*/
|
|
--
|
|
2.25.1
|