Skip to contentSkip to conversation

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

PATCH Superseded Denis V. Lunev 3 participants 3 messages Jul 26, 2023 – Jul 27, 2023

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

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

Unfortunately
commit 03b67621445d601c9cdc7dfe25812e9f19b81488
Author: Denis V. Lunev <[email protected]>
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.

CC Eric Blake <[email protected]>
CC Vladimir Sementsov-Ogievskiy <[email protected]>
---
 qemu-nbd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
qemu-nbd.c +2 -1
index 5b2757920c..7a15085ade 100644
@@ -589,6 +589,7 @@ int main(int argc, char **argv)
     const char *pid_file_name = NULL;
     const char *selinux_label = NULL;
     BlockExportOptions *export_opts;
+    struct NbdClientOpts opts;
 
 #ifdef CONFIG_POSIX
     os_setup_early_signal_handling();
@@ -1145,7 +1146,7 @@ int main(int argc, char **argv)
     if (device) {
 #if HAVE_NBD_DEVICE
         int ret;
-        struct NbdClientOpts opts = {
+        opts = (struct NbdClientOpts) {
             .device = device,
             .fork_process = fork_process,
             .verbose = verbose,
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 36 lines · Denis V. Lunev

Unfortunately
commit 03b67621445d601c9cdc7dfe25812e9f19b81488
Author: Denis V. Lunev <[email protected]>
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.

CC Eric Blake <[email protected]>
CC Vladimir Sementsov-Ogievskiy <[email protected]>
---
 qemu-nbd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
qemu-nbd.c +1 -0
index 5b2757920c..7a15085ade 100644
@@ -589,6 +589,7 @@ int main(int argc, char **argv)
     const char *pid_file_name = NULL;
     const char *selinux_label = NULL;
     BlockExportOptions *export_opts;
+    struct NbdClientOpts opts;
 
 #ifdef CONFIG_POSIX
     os_setup_early_signal_handling();

qemu-nbd.c int main(int argc, char **argv) · line 1149

Quoted 5 lines
qemu-nbd.c +1 -1
@@ -1145,7 +1146,7 @@ int main(int argc, char **argv)
     if (device) {
 #if HAVE_NBD_DEVICE
         int ret;
-        struct NbdClientOpts opts = {
+        opts = (struct NbdClientOpts) {

Does this case a compiler warning for an unused variable when HAVE_NBD_DEVICE is not set? If so, the solution is to also wrap the declaration in the same #if. I'll see if I can figure out the CI enough to prove (or disprove) my theory on a BSD machine which likely lacks HAVE_NBD_DEVICE.

With that addressed, I'm fine with:

and I will queue it through my NBD tree in time for 8.1-rc2.

Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.
Virtualization:  qemu.org | libguestfs.org
#2 lore raw
Quoted 48 lines · Eric Blake
Quoted 36 lines · Denis V. Lunev

Unfortunately
commit 03b67621445d601c9cdc7dfe25812e9f19b81488
Author: Denis V. Lunev <[email protected]>
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.

CC Eric Blake <[email protected]>
CC Vladimir Sementsov-Ogievskiy <[email protected]>
---
  qemu-nbd.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
qemu-nbd.c +1 -0
index 5b2757920c..7a15085ade 100644
@@ -589,6 +589,7 @@ int main(int argc, char **argv)
      const char *pid_file_name = NULL;
      const char *selinux_label = NULL;
      BlockExportOptions *export_opts;
+    struct NbdClientOpts opts;
 
  #ifdef CONFIG_POSIX
      os_setup_early_signal_handling();

qemu-nbd.c int main(int argc, char **argv) · line 1149

Quoted 5 lines
qemu-nbd.c +1 -1
@@ -1145,7 +1146,7 @@ int main(int argc, char **argv)
      if (device) {
  #if HAVE_NBD_DEVICE
          int ret;
-        struct NbdClientOpts opts = {
+        opts = (struct NbdClientOpts) {

Does this case a compiler warning for an unused variable when HAVE_NBD_DEVICE is not set? If so, the solution is to also wrap the declaration in the same #if. I'll see if I can figure out the CI enough to prove (or disprove) my theory on a BSD machine which likely lacks HAVE_NBD_DEVICE.

Quoted 6 lines

With that addressed, I'm fine with:

and I will queue it through my NBD tree in time for 8.1-rc2.

Double checked. We will have an error there as 'struct NbdClientOps' is defined under HAVE_NBD_DEVICE only.

../qemu-nbd.c: In function ‘main’:
../qemu-nbd.c:592:26: error: storage size of ‘opts’ isn’t known 592 |     struct NbdClientOpts opts;
      |                          ^~~~
../qemu-nbd.c:592:26: warning: unused variable ‘opts’ [-Wunused-variable]

Checked with simple

qemu-nbd.c +0 -0
@@ -52,7 +52,7 @@

 #endif

 #ifdef __linux__
-#define HAVE_NBD_DEVICE 1
+#define HAVE_NBD_DEVICE 0
 #else
 #define HAVE_NBD_DEVICE 0
 #endif

Den