From fbd5c4c0db47e578e3fdd88a0ebc4314a1ed3d42 Mon Sep 17 00:00:00 2001 From: Murilo Opsfelder Araujo Date: Fri, 5 Jan 2018 12:44:40 -0200 Subject: [PATCH 1/2] block/ssh: fix possible segmentation fault when .desc is not null-terminated 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 Cc: Eric Blake Signed-off-by: Murilo Opsfelder Araujo Reviewed-by: Eric Blake Reviewed-by: Jeff Cody Signed-off-by: Jeff Cody --- block/ssh.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/ssh.c b/block/ssh.c index b049a16eb9..8890a0c4ba 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 */ } }, }; From 45a79646ea746fa3f32083d0aa70512aae29f6b3 Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Wed, 17 Jan 2018 14:50:15 +0100 Subject: [PATCH 2/2] iotests: Make 200 run on tmpfs 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 Reviewed-by: Jeff Cody Message-id: 20180117135015.15051-1-mreitz@redhat.com Signed-off-by: Jeff Cody --- 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 d8787ddb46..ddbdedc476 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