From nobody Sun May 5 09:08:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 151745820310720.016118571129937; Wed, 31 Jan 2018 20:10:03 -0800 (PST) Received: from localhost ([::1]:56057 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eh6CI-0002hh-8E for importer@patchew.org; Wed, 31 Jan 2018 23:10:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eh696-0000WS-0X for qemu-devel@nongnu.org; Wed, 31 Jan 2018 23:06:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eh695-0008O9-2T for qemu-devel@nongnu.org; Wed, 31 Jan 2018 23:06:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55914) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eh690-0008IX-J2; Wed, 31 Jan 2018 23:06:38 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E19F08FAB6; Thu, 1 Feb 2018 04:06:37 +0000 (UTC) Received: from localhost (ovpn-122-144.rdu2.redhat.com [10.10.122.144]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 82E475D9C8; Thu, 1 Feb 2018 04:06:37 +0000 (UTC) From: Jeff Cody To: qemu-block@nongnu.org Date: Wed, 31 Jan 2018 23:06:34 -0500 Message-Id: <20180201040635.5749-2-jcody@redhat.com> In-Reply-To: <20180201040635.5749-1-jcody@redhat.com> References: <20180201040635.5749-1-jcody@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 01 Feb 2018 04:06:37 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/2] block/ssh: fix possible segmentation fault when .desc is not null-terminated X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, jcody@redhat.com, qemu-devel@nongnu.org, Max Reitz , Murilo Opsfelder Araujo Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Murilo Opsfelder Araujo This patch prevents a possible segmentation fault when .desc members are ch= ecked against NULL. The ssh_runtime_opts was added by commit 8a6a80896d6af03b8ee0c17cdf37219eca2588a7 ("block/ssh: Use QemuOpts for runt= ime options"). This fix was inspired by http://lists.nongnu.org/archive/html/qemu-devel/2018-01/msg00883.html. Fixes: 8a6a80896d6af03b8ee0c17cdf37219eca2588a7 ("block/ssh: Use QemuOpts f= or 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 b049a16..8890a0c 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -556,6 +556,7 @@ static QemuOptsList ssh_runtime_opts =3D { .type =3D QEMU_OPT_STRING, .help =3D "Defines how and what to check the host key against", }, + { /* end of list */ } }, }; =20 --=20 2.9.5 From nobody Sun May 5 09:08:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517458111494396.8682356932833; Wed, 31 Jan 2018 20:08:31 -0800 (PST) Received: from localhost ([::1]:55948 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eh6Al-0001SR-4H for importer@patchew.org; Wed, 31 Jan 2018 23:08:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eh695-0000WJ-Vh for qemu-devel@nongnu.org; Wed, 31 Jan 2018 23:06:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eh695-0008Oo-6N for qemu-devel@nongnu.org; Wed, 31 Jan 2018 23:06:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55920) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eh691-0008L3-Sp; Wed, 31 Jan 2018 23:06:39 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 32E768FAB1; Thu, 1 Feb 2018 04:06:39 +0000 (UTC) Received: from localhost (ovpn-122-144.rdu2.redhat.com [10.10.122.144]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E523F5D9C8; Thu, 1 Feb 2018 04:06:38 +0000 (UTC) From: Jeff Cody To: qemu-block@nongnu.org Date: Wed, 31 Jan 2018 23:06:35 -0500 Message-Id: <20180201040635.5749-3-jcody@redhat.com> In-Reply-To: <20180201040635.5749-1-jcody@redhat.com> References: <20180201040635.5749-1-jcody@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 01 Feb 2018 04:06:39 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/2] iotests: Make 200 run on tmpfs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, jcody@redhat.com, qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Max Reitz 200 currently fails on tmpfs because it sets cache=3Dnone. However, without that (and aio=3Dnative), the test still works now and it fails before Jeff's series (on fc7dbc119e0852a70dc9fa68bb41a318e49e4cd6). So we can probably remove the aio=3Dnative safely, and replace cache=3Dnone by cache=3D$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 d8787dd..ddbdedc 100755 --- a/tests/qemu-iotests/200 +++ b/tests/qemu-iotests/200 @@ -60,7 +60,7 @@ qemu_comm_method=3D"qmp" _launch_qemu -device pci-bridge,id=3Dbridge1,chassis_nr=3D1,bus=3Dpci.0 \ -object iothread,id=3Diothread0 \ -device virtio-scsi-pci,bus=3Dbridge1,addr=3D0x1f,id=3Dscsi0,= iothread=3Diothread0 \ - -drive file=3D"${TEST_IMG}",media=3Ddisk,if=3Dnone,cache=3Dno= ne,id=3Ddrive_sysdisk,aio=3Dnative,format=3D$IMGFMT \ + -drive file=3D"${TEST_IMG}",media=3Ddisk,if=3Dnone,cache=3D$C= ACHEMODE,id=3Ddrive_sysdisk,format=3D$IMGFMT \ -device scsi-hd,drive=3Ddrive_sysdisk,bus=3Dscsi0.0,id=3Dsysd= isk,bootindex=3D0 h1=3D$QEMU_HANDLE =20 --=20 2.9.5