8a522bdd9f
- nbd/server: CVE-2024-7409: Close stray clients at server-stop - main-loop.h: introduce qemu_in_main_thread() - aio-wait.h: introduce AIO_WAIT_WHILE_UNLOCKED - nbd/server: CVE-2024-7409: Drop non-negotiating clients - nbd/server: CVE-2024-7409: Cap default max-connections to 100 - nbd/server: Plumb in new args to nbd_client_add() - nbd: Minor style and typo fixes Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 5e30f8e310a15452f86723a0ae459d303cc29470)
50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
From 1953dfe58fae8c778b275d786a4166add940353d Mon Sep 17 00:00:00 2001
|
|
From: Eric Blake <eblake@redhat.com>
|
|
Date: Thu, 1 Aug 2024 16:49:20 -0500
|
|
Subject: [PATCH 1/7] nbd: Minor style and typo fixes
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Touch up a comment with the wrong type name, and an over-long line,
|
|
both noticed while working on upcoming patches.
|
|
|
|
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
Message-ID: <20240807174943.771624-10-eblake@redhat.com>
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
---
|
|
nbd/server.c | 2 +-
|
|
qemu-nbd.c | 3 ++-
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/nbd/server.c b/nbd/server.c
|
|
index 37515ed520..73fd4c46d1 100644
|
|
--- a/nbd/server.c
|
|
+++ b/nbd/server.c
|
|
@@ -1801,7 +1801,7 @@ static void nbd_export_request_shutdown(BlockExport *blk_exp)
|
|
|
|
blk_exp_ref(&exp->common);
|
|
/*
|
|
- * TODO: Should we expand QMP NbdServerRemoveNode enum to allow a
|
|
+ * TODO: Should we expand QMP BlockExportRemoveMode enum to allow a
|
|
* close mode that stops advertising the export to new clients but
|
|
* still permits existing clients to run to completion? Because of
|
|
* that possibility, nbd_export_close() can be called more than
|
|
diff --git a/qemu-nbd.c b/qemu-nbd.c
|
|
index 15a4bc4018..86dfa0b5d9 100644
|
|
--- a/qemu-nbd.c
|
|
+++ b/qemu-nbd.c
|
|
@@ -561,7 +561,8 @@ int main(int argc, char **argv)
|
|
pthread_t client_thread;
|
|
const char *fmt = NULL;
|
|
Error *local_err = NULL;
|
|
- BlockdevDetectZeroesOptions detect_zeroes = BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF;
|
|
+ BlockdevDetectZeroesOptions detect_zeroes =
|
|
+ BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF;
|
|
QDict *options = NULL;
|
|
const char *export_name = NULL; /* defaults to "" later for server mode */
|
|
const char *export_description = NULL;
|
|
--
|
|
2.45.1.windows.1
|
|
|