mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-12-03 19:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu-nbd: regression with arguments passing into nbd_client_thread()

Browse Source 
Unfortunately
    commit 03b6762144
    (7.2:  6e216d21b5)
    Author: Denis V. Lunev <den@openvz.org>
    Date:   Mon Jul 17 16:55:40 2023 +0200
    qemu-nbd: pass structure into nbd_client_thread instead of plain char*
has introduced a regression. struct NbdClientOpts resides on stack inside
'if' block. This specifically means that this stack space could be reused
once the execution will leave that block of the code.

This means that parameters passed into nbd_client_thread could be
overwritten at any moment.

The patch moves the data to the namespace of main() function effectively
preserving it for the whole process lifetime.

Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Eric Blake <eblake@redhat.com>
CC: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
CC: <qemu-stable@nongnu.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-ID: <20230727105828.324314-1-den@openvz.org>
Signed-off-by: Eric Blake <eblake@redhat.com>
(cherry picked from commit e5b815b0de)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
(Mjt: add reference to 6e216d21b5 for 7.2 branch)
This commit is contained in:
Denis V. Lunev
2023-07-27 12:58:28 +02:00
committed by Michael Tokarev
parent 742612345a
commit 3b80317c91
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
qemu-nbd.c
View File

@@ -584,6 +584,9 @@ int main(int argc, char **argv)
const char *pid_file_name = NULL; const char *pid_file_name = NULL;
const char *selinux_label = NULL; const char *selinux_label = NULL;
BlockExportOptions *export_opts; BlockExportOptions *export_opts;
#if HAVE_NBD_DEVICE
struct NbdClientOpts opts;
#endif
#ifdef CONFIG_POSIX #ifdef CONFIG_POSIX
os_setup_early_signal_handling(); os_setup_early_signal_handling();
@@ -1122,7 +1125,7 @@ int main(int argc, char **argv)
if (device) { if (device) {
#if HAVE_NBD_DEVICE #if HAVE_NBD_DEVICE
int ret; int ret;
struct NbdClientOpts opts = { opts = (struct NbdClientOpts) {
.device = device, .device = device,
.fork_process = fork_process, .fork_process = fork_process,
}; };