39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
From a68553792a8512a2d266bbb86f064f78b5482a65 Mon Sep 17 00:00:00 2001
|
|
From: Joseph Sutton <josephsutton@catalyst.net.nz>
|
|
Date: Tue, 21 Jun 2022 14:41:02 +1200
|
|
Subject: [PATCH 03/99] CVE-2022-32746 s4/dsdb/partition: Fix LDB flags
|
|
comparison
|
|
|
|
LDB_FLAG_MOD_* values are not actually flags, and the previous
|
|
comparison was equivalent to
|
|
|
|
(req_msg->elements[el_idx].flags & LDB_FLAG_MOD_MASK) != 0
|
|
|
|
which is true whenever any of the LDB_FLAG_MOD_* values are set. Correct
|
|
the expression to what it was probably intended to be.
|
|
|
|
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15009
|
|
|
|
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
|
|
---
|
|
source4/dsdb/samdb/ldb_modules/partition.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/source4/dsdb/samdb/ldb_modules/partition.c b/source4/dsdb/samdb/ldb_modules/partition.c
|
|
index 2544a106d13..2d90ca5d1b3 100644
|
|
--- a/source4/dsdb/samdb/ldb_modules/partition.c
|
|
+++ b/source4/dsdb/samdb/ldb_modules/partition.c
|
|
@@ -493,8 +493,8 @@ static int partition_copy_all_callback_action(
|
|
* them here too
|
|
*/
|
|
for (el_idx=0; el_idx < req_msg->num_elements; el_idx++) {
|
|
- if (req_msg->elements[el_idx].flags & LDB_FLAG_MOD_DELETE
|
|
- || ((req_msg->elements[el_idx].flags & LDB_FLAG_MOD_REPLACE) &&
|
|
+ if (LDB_FLAG_MOD_TYPE(req_msg->elements[el_idx].flags) == LDB_FLAG_MOD_DELETE
|
|
+ || ((LDB_FLAG_MOD_TYPE(req_msg->elements[el_idx].flags) == LDB_FLAG_MOD_REPLACE) &&
|
|
req_msg->elements[el_idx].num_values == 0)) {
|
|
if (ldb_msg_find_element(modify_msg,
|
|
req_msg->elements[el_idx].name) != NULL) {
|
|
--
|
|
2.25.1
|