60 lines
1.7 KiB
Diff
60 lines
1.7 KiB
Diff
From ee428be9c67b1a7c9720c98f4aa67208e1b2938b Mon Sep 17 00:00:00 2001
|
|
From: Ralph Boehme <slow@samba.org>
|
|
Date: Tue, 20 Jun 2023 11:05:22 +0200
|
|
Subject: [PATCH 14/28] CVE-2023-34968: mdssvc: switch to doing an early return
|
|
|
|
Just reduce indentation of the code handling the success case. No change in
|
|
behaviour.
|
|
|
|
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15388
|
|
|
|
Signed-off-by: Ralph Boehme <slow@samba.org>
|
|
Reviewed-by: Stefan Metzmacher <metze@samba.org>
|
|
|
|
Conflict: NA
|
|
Reference: https://download.samba.org/pub/samba/patches/security/samba-4.17.10-security-2023-07-19.patch
|
|
---
|
|
source3/rpc_server/mdssvc/mdssvc.c | 26 ++++++++++++++------------
|
|
1 file changed, 14 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/source3/rpc_server/mdssvc/mdssvc.c b/source3/rpc_server/mdssvc/mdssvc.c
|
|
index 9c23ef95753..070503f9eeb 100644
|
|
--- a/source3/rpc_server/mdssvc/mdssvc.c
|
|
+++ b/source3/rpc_server/mdssvc/mdssvc.c
|
|
@@ -1804,19 +1804,21 @@ bool mds_dispatch(struct mds_ctx *mds_ctx,
|
|
}
|
|
|
|
ok = slcmd->function(mds_ctx, query, reply);
|
|
- if (ok) {
|
|
- DBG_DEBUG("%s", dalloc_dump(reply, 0));
|
|
-
|
|
- len = sl_pack(reply,
|
|
- (char *)response_blob->spotlight_blob,
|
|
- response_blob->size);
|
|
- if (len == -1) {
|
|
- DBG_ERR("error packing Spotlight RPC reply\n");
|
|
- ok = false;
|
|
- goto cleanup;
|
|
- }
|
|
- response_blob->length = len;
|
|
+ if (!ok) {
|
|
+ goto cleanup;
|
|
+ }
|
|
+
|
|
+ DBG_DEBUG("%s", dalloc_dump(reply, 0));
|
|
+
|
|
+ len = sl_pack(reply,
|
|
+ (char *)response_blob->spotlight_blob,
|
|
+ response_blob->size);
|
|
+ if (len == -1) {
|
|
+ DBG_ERR("error packing Spotlight RPC reply\n");
|
|
+ ok = false;
|
|
+ goto cleanup;
|
|
}
|
|
+ response_blob->length = len;
|
|
|
|
cleanup:
|
|
talloc_free(query);
|
|
--
|
|
2.34.1
|