* [Qemu-devel] [PULL 1/2] block/ssh: fix possible segmentation fault when .desc is not null-terminated
2018-02-01 4:06 [Qemu-devel] [PULL 0/2] Block patches Jeff Cody
@ 2018-02-01 4:06 ` Jeff Cody
2018-02-01 4:06 ` [Qemu-devel] [PULL 2/2] iotests: Make 200 run on tmpfs Jeff Cody
2018-02-02 10:57 ` [Qemu-devel] [PULL 0/2] Block patches Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Jeff Cody @ 2018-02-01 4:06 UTC (permalink / raw)
To: qemu-block
Cc: peter.maydell, jcody, qemu-devel, Murilo Opsfelder Araujo,
Max Reitz, Eric Blake
From: Murilo Opsfelder Araujo <muriloo@linux.vnet.ibm.com>
This patch prevents a possible segmentation fault when .desc members are checked
against NULL.
The ssh_runtime_opts was added by commit
8a6a80896d6af03b8ee0c17cdf37219eca2588a7 ("block/ssh: Use QemuOpts for runtime
options").
This fix was inspired by
http://lists.nongnu.org/archive/html/qemu-devel/2018-01/msg00883.html.
Fixes: 8a6a80896d6af03b8ee0c17cdf37219eca2588a7 ("block/ssh: Use QemuOpts for runtime options")
Cc: Max Reitz <mreitz@redhat.com>
Cc: Eric Blake <eblake@redhat.com>
Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.vnet.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
block/ssh.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/block/ssh.c b/block/ssh.c
index b049a16..8890a0c 100644
--- a/block/ssh.c
+++ b/block/ssh.c
@@ -556,6 +556,7 @@ static QemuOptsList ssh_runtime_opts = {
.type = QEMU_OPT_STRING,
.help = "Defines how and what to check the host key against",
},
+ { /* end of list */ }
},
};
--
2.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Qemu-devel] [PULL 2/2] iotests: Make 200 run on tmpfs
2018-02-01 4:06 [Qemu-devel] [PULL 0/2] Block patches Jeff Cody
2018-02-01 4:06 ` [Qemu-devel] [PULL 1/2] block/ssh: fix possible segmentation fault when .desc is not null-terminated Jeff Cody
@ 2018-02-01 4:06 ` Jeff Cody
2018-02-02 10:57 ` [Qemu-devel] [PULL 0/2] Block patches Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Jeff Cody @ 2018-02-01 4:06 UTC (permalink / raw)
To: qemu-block; +Cc: peter.maydell, jcody, qemu-devel, Max Reitz
From: Max Reitz <mreitz@redhat.com>
200 currently fails on tmpfs because it sets cache=none. However,
without that (and aio=native), the test still works now and it fails
before Jeff's series (on fc7dbc119e0852a70dc9fa68bb41a318e49e4cd6). So
we can probably remove the aio=native safely, and replace cache=none by
cache=$CACHEMODE.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Message-id: 20180117135015.15051-1-mreitz@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
tests/qemu-iotests/200 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
index d8787dd..ddbdedc 100755
--- a/tests/qemu-iotests/200
+++ b/tests/qemu-iotests/200
@@ -60,7 +60,7 @@ qemu_comm_method="qmp"
_launch_qemu -device pci-bridge,id=bridge1,chassis_nr=1,bus=pci.0 \
-object iothread,id=iothread0 \
-device virtio-scsi-pci,bus=bridge1,addr=0x1f,id=scsi0,iothread=iothread0 \
- -drive file="${TEST_IMG}",media=disk,if=none,cache=none,id=drive_sysdisk,aio=native,format=$IMGFMT \
+ -drive file="${TEST_IMG}",media=disk,if=none,cache=$CACHEMODE,id=drive_sysdisk,format=$IMGFMT \
-device scsi-hd,drive=drive_sysdisk,bus=scsi0.0,id=sysdisk,bootindex=0
h1=$QEMU_HANDLE
--
2.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread