From nobody Wed May 8 23:51:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1575300951; cv=none; d=zohomail.com; s=zohoarc; b=oIXwE1vdJDTA0Ggq7HpOkrBYuCrY8nQQhr/Ki4YORsCBCoGP5Unh+n7gzGrEbf4zDQX0GItgGLTRvd02ZvXHmWBdP5aLUhclj18SB9n7glzoOmeAaFYGadWcs8TG0PI/Fns6juUvaWgnMYSoh1Ey5f3bhScqi3yXetaZl1y5WSc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575300951; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9kcUZTGSiLMTPm77liPqmIhGfhTUFPmm1VSRjsADLlM=; b=ZJ9YVD0xZ2+4Kz9RyNxl08t1QjtNNYZe+O02fP+oPU6mTv781iq61tRjwd+09/MEstf1IjUSTOU3GCwP/eDQPEGc7NVRrOGES34268cmXRYSZQ8UUPLvvOdslFU9emcsu7r/kNnYsEEdS0koriO5d8Vzgk28xY4t9NmTtGxjchk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157530095124864.47172286442913; Mon, 2 Dec 2019 07:35:51 -0800 (PST) Received: from localhost ([::1]:37562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibnjq-0006b2-5j for importer@patchew.org; Mon, 02 Dec 2019 10:35:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46296) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibncL-0006dW-6O for qemu-devel@nongnu.org; Mon, 02 Dec 2019 10:28:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibncH-0002Hj-LL for qemu-devel@nongnu.org; Mon, 02 Dec 2019 10:28:03 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:21701 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ibncF-0002FU-P3 for qemu-devel@nongnu.org; Mon, 02 Dec 2019 10:28:01 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-60-O79bpIUPMbuSYLELkLm5qQ-1; Mon, 02 Dec 2019 10:27:57 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id F3ECB8C02D1 for ; Mon, 2 Dec 2019 15:27:56 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-134.ams2.redhat.com [10.36.116.134]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 93F5D5E240; Mon, 2 Dec 2019 15:27:47 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 1F70311385C7; Mon, 2 Dec 2019 16:27:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575300478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9kcUZTGSiLMTPm77liPqmIhGfhTUFPmm1VSRjsADLlM=; b=LplcCK1jm33rAY7hd/eNEMDxI/UlFJ5r2osLqUaQCOG7hMl1Lq39wpUKBWoRPrxWPjLk5G bsR28XNg8mfQKrC9u3zZDR8YtE16IRTvSxO2x6ZPRTzzPwWYDPXLlqY790ZdQbJNUQSaFx H1fNvFtV1Au0cnd62P7/rgJhB3pMj3c= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL for-4.2 1/3] net/virtio: Drop useless n->primary_dev not null checks Date: Mon, 2 Dec 2019 16:27:44 +0100 Message-Id: <20191202152746.32292-2-armbru@redhat.com> In-Reply-To: <20191202152746.32292-1-armbru@redhat.com> References: <20191202152746.32292-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: O79bpIUPMbuSYLELkLm5qQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jens Freimann , "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" virtio_net_handle_migration_primary() returns early when it can't ensure n->primary_dev is non-null. Checking it again right after that early return is redundant. Drop. If n->primary_dev is null on entering failover_replug_primary(), @pdev will become null, and pdev->partially_hotplugged will crash. Checking n->primary_dev later is useless. It can't actually be null, because its caller virtio_net_handle_migration_primary() ensures it isn't. Drop the useless check. Cc: Jens Freimann Cc: Michael S. Tsirkin Signed-off-by: Markus Armbruster Message-Id: <20191130194240.10517-2-armbru@redhat.com> Reviewed-by: Jens Freimann --- hw/net/virtio-net.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 3c31471026..87088ba374 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -2810,11 +2810,6 @@ static bool failover_replug_primary(VirtIONet *n, Er= ror **errp) goto out; } } - if (!n->primary_dev) { - error_setg(errp, "virtio_net: couldn't find primary device"); - goto out; - } - n->primary_bus =3D n->primary_dev->parent_bus; if (!n->primary_bus) { error_setg(errp, "virtio_net: couldn't find primary bus"); @@ -2849,8 +2844,7 @@ static void virtio_net_handle_migration_primary(VirtI= ONet *n, } } =20 - if (migration_in_setup(s) && !should_be_hidden && - n->primary_dev) { + if (migration_in_setup(s) && !should_be_hidden) { if (failover_unplug_primary(n)) { vmstate_unregister(n->primary_dev, qdev_get_vmsd(n->primary_de= v), n->primary_dev); --=20 2.21.0 From nobody Wed May 8 23:51:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1575300824; cv=none; d=zohomail.com; s=zohoarc; b=bpYd2wCZTTuwgygGVtpe0FFEpolUyzvgiZlS7uujUpLMDq+uwOD/BhdGRsYBx87SPrUaNkRd/PXIPwUUHMVTRgJQAK/MJylqNvH8YnJ4N5jeU4nP4bMny4tDzlU4JN4sUzQbh/+ezgKzJfO/b5TEANlWJLAk5+rAm5T/nUWgXwA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575300824; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xBDdCfk4cP0KSIRSYmwSzNaOEU53KBS+MmKZTAiNTAo=; b=P9vNfw6Lenf6n/ZzXI8iX5hCP24ogy+RKxyZvlP123xmBjlJhqtDysVjbVpU+xS01iI6HyzyNKUFVCklqX2Lnep4kmmMjzqMTnO4gG4N7fkcch0+L0kz9/JF7pY5ZU25FBSVJZmnJi7hjYjiFO0CDJZHOQp/DHfHgXF239FSZtk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1575300824892941.350340319435; Mon, 2 Dec 2019 07:33:44 -0800 (PST) Received: from localhost ([::1]:37488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibnhn-0003HL-92 for importer@patchew.org; Mon, 02 Dec 2019 10:33:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46269) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibncH-0006cU-MU for qemu-devel@nongnu.org; Mon, 02 Dec 2019 10:28:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibncF-0002Fo-QM for qemu-devel@nongnu.org; Mon, 02 Dec 2019 10:28:01 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:37236) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ibncE-0002EP-2s for qemu-devel@nongnu.org; Mon, 02 Dec 2019 10:27:59 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-4-pTZlL3tmNpWCqLTeWifk4Q-1; Mon, 02 Dec 2019 10:27:54 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E525D803B62 for ; Mon, 2 Dec 2019 15:27:53 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-134.ams2.redhat.com [10.36.116.134]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AE93760C05; Mon, 2 Dec 2019 15:27:47 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 2467711366CC; Mon, 2 Dec 2019 16:27:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575300475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xBDdCfk4cP0KSIRSYmwSzNaOEU53KBS+MmKZTAiNTAo=; b=dZyE/y/BvXyv9rG/gqvKMX3XeUDgQ8NRNys6zHZtS4BcnSlVoPCeCy2Kk6JRL1u93wc1B0 PyQXET+ZTX1S+kLyeJ2zF5UGJH3ZS32OLMIbhHGQwc/MAUbvHAzYkKRgw2TO9xAnvq9yMW CzfB0qWP2DLwkAmxKnACPW/dP/3hzUg= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL for-4.2 2/3] net/virtio: Fix failover error handling crash bugs Date: Mon, 2 Dec 2019 16:27:45 +0100 Message-Id: <20191202152746.32292-3-armbru@redhat.com> In-Reply-To: <20191202152746.32292-1-armbru@redhat.com> References: <20191202152746.32292-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: pTZlL3tmNpWCqLTeWifk4Q-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jens Freimann , "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Functions that take an Error ** parameter to pass an error to the caller expect the parameter to point to null. failover_replug_primary() violates this precondition in several places: * After qemu_opts_from_qdict() failed, *errp is no longer null. Passing it to error_setg() is wrong, and will trip the assertion in error_setv(). Messed up in commit 150ab54aa6 "net/virtio: fix re-plugging of primary device". Simply drop the error_setg(). * Passing @errp to qemu_opt_set_bool(), hotplug_handler_pre_plug(), and hotplug_handler_plug() is wrong. If one of the first two fails, *errp is no longer null. Risks tripping the same assertion. Moreover, continuing after such errors is unsafe. Messed up in commit 9711cd0dfc "net/virtio: add failover support". Fix by handling each error properly. failover_replug_primary() crashes when passed a null @errp. Also messed up in commit 9711cd0dfc. This bug can't bite as no caller actually passes null. Fix it anyway. Fixes: 9711cd0dfc3fa414f7f64935713c07134ae67971 Fixes: 150ab54aa6934583180f88a2bd540bc6fc4fbff3 Cc: Jens Freimann Cc: Michael S. Tsirkin Signed-off-by: Markus Armbruster Message-Id: <20191130194240.10517-3-armbru@redhat.com> Reviewed-by: Jens Freimann --- hw/net/virtio-net.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 87088ba374..db3d7c38e6 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -2795,6 +2795,7 @@ static bool failover_unplug_primary(VirtIONet *n) =20 static bool failover_replug_primary(VirtIONet *n, Error **errp) { + Error *err =3D NULL; HotplugHandler *hotplug_ctrl; PCIDevice *pdev =3D PCI_DEVICE(n->primary_dev); =20 @@ -2806,27 +2807,33 @@ static bool failover_replug_primary(VirtIONet *n, E= rror **errp) qemu_find_opts("device"), n->primary_device_dict, errp); if (!n->primary_device_opts) { - error_setg(errp, "virtio_net: couldn't find primary device opt= s"); - goto out; + return false; } } n->primary_bus =3D n->primary_dev->parent_bus; if (!n->primary_bus) { error_setg(errp, "virtio_net: couldn't find primary bus"); - goto out; + return false; } qdev_set_parent_bus(n->primary_dev, n->primary_bus); n->primary_should_be_hidden =3D false; qemu_opt_set_bool(n->primary_device_opts, - "partially_hotplugged", true, errp); + "partially_hotplugged", true, &err); + if (err) { + goto out; + } hotplug_ctrl =3D qdev_get_hotplug_handler(n->primary_dev); if (hotplug_ctrl) { - hotplug_handler_pre_plug(hotplug_ctrl, n->primary_dev, errp); + hotplug_handler_pre_plug(hotplug_ctrl, n->primary_dev, &err); + if (err) { + goto out; + } hotplug_handler_plug(hotplug_ctrl, n->primary_dev, errp); } =20 out: - return *errp =3D=3D NULL; + error_propagate(errp, err); + return !err; } =20 static void virtio_net_handle_migration_primary(VirtIONet *n, --=20 2.21.0 From nobody Wed May 8 23:51:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1575300551; cv=none; d=zohomail.com; s=zohoarc; b=Fvhjk9D0Wt+94nM2H6eQU5ADqtsMnPaY2HabBmKBvEhfvU1gzT2haECbh7yqGLRBbGKRDD5EzMhbOBW6dWAXoAn5wi97IRXqfM+28nICpZRevNanuoqzuThbpQLRP4e1TzLbcInm/eKOMjauAG0EEzbjXuOhipePQ6vW//z6HjY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575300551; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fNuI1Lg6PUcU0g7g48qRrIfBTSi72AXKORyODJL3r7w=; b=lALNMh7L2MCpLnxLFrgB9aO17u8nQk4x6DkwNXhsx30XZXl79++VyFXCE4b5xzeUfvAx8jnJYBsNux1aG+fVBr87bik9IAQcN7p6w7LNXi5NANgxBolwq4vzFqr0hrTMNyQ0D0A/Pv9X8Xbd9dI+vF26bT3G+B6Z+PoH3safmZI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1575300551691432.7952646142369; Mon, 2 Dec 2019 07:29:11 -0800 (PST) Received: from localhost ([::1]:37445 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibndO-00082q-4K for importer@patchew.org; Mon, 02 Dec 2019 10:29:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46283) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibncJ-0006cy-Mb for qemu-devel@nongnu.org; Mon, 02 Dec 2019 10:28:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibncH-0002Hc-Ky for qemu-devel@nongnu.org; Mon, 02 Dec 2019 10:28:03 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:60924 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ibncF-0002Ex-Of for qemu-devel@nongnu.org; Mon, 02 Dec 2019 10:27:59 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-342-zJoXIhVWPNe4VFAjnwyjZg-1; Mon, 02 Dec 2019 10:27:54 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1C16B100F607; Mon, 2 Dec 2019 15:27:52 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-134.ams2.redhat.com [10.36.116.134]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 96DA35DA32; Mon, 2 Dec 2019 15:27:47 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 279EC11366CF; Mon, 2 Dec 2019 16:27:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575300477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fNuI1Lg6PUcU0g7g48qRrIfBTSi72AXKORyODJL3r7w=; b=NNkLy9qDz8gYvbY/Z8CPR3BJUPQutvpuEwbiAb5wRE545DOX7qBZTcwZWu3hLSZt3zEvLM Gt0joCSgHFVmREeebX6rsOcCz6T/ITWSQHtKO2ViGexbBlOpIZvxt4SXtf/55xUqmndCho Sp9muESskKFPJaN6b/LMYnFu4KenDI0= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL for-4.2 3/3] block/file-posix: Fix laio_init() error handling crash bug Date: Mon, 2 Dec 2019 16:27:46 +0100 Message-Id: <20191202152746.32292-4-armbru@redhat.com> In-Reply-To: <20191202152746.32292-1-armbru@redhat.com> References: <20191202152746.32292-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: zJoXIhVWPNe4VFAjnwyjZg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Nishanth Aravamudan , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" raw_aio_attach_aio_context() passes uninitialized Error *local_err by reference to laio_init() via aio_setup_linux_aio(). When laio_init() fails, it passes it on to error_setg_errno(), tripping error_setv()'s assertion unless @local_err is null by dumb luck. Fix by initializing @local_err properly. Fixes: ed6e2161715c527330f936d44af4c547f25f687e Cc: Nishanth Aravamudan Cc: Stefan Hajnoczi Cc: Kevin Wolf Signed-off-by: Markus Armbruster Message-Id: <20191130194240.10517-4-armbru@redhat.com> Reviewed-by: Stefan Hajnoczi Reviewed-by: Kevin Wolf --- block/file-posix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/file-posix.c b/block/file-posix.c index 1f0f61a02b..1b805bd938 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1973,7 +1973,7 @@ static void raw_aio_attach_aio_context(BlockDriverSta= te *bs, #ifdef CONFIG_LINUX_AIO BDRVRawState *s =3D bs->opaque; if (s->use_linux_aio) { - Error *local_err; + Error *local_err =3D NULL; if (!aio_setup_linux_aio(new_context, &local_err)) { error_reportf_err(local_err, "Unable to use native AIO, " "falling back to thread pool: "); --=20 2.21.0