From nobody Mon Feb 9 16:19:41 2026 Delivered-To: importer@patchew.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=1588145681; cv=none; d=zohomail.com; s=zohoarc; b=WqdKpEy/Jlm+upxLS3XCE9vwKQ80WDUJT/c+VH4DDRTESU5plNWxo2ZIHrQOpUd1PxYFiGnTlceJlLZl19hYntS/yxdSQtfesyYoklasokn3G44hoqVWt2TU0Xfd8MB7JhD4LWFmrwVRscVbeaAS5ntqHQrHuaXZY1z+m4vVhao= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588145681; 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=5n34gq+3RmHjy+dXJz5n6EkI7iwJ+vPmZrsqkO05GB4=; b=j1P0pf770YyZtcGfvCV4sjZvB4MZe+e8d+UE8fD8Yd263EPDbl5qywP8dwnPFjq7+Y5SEkK4L72HcgQ9Lb2M37H/+fPJArG53K2MLznH7clCIToZuRvHF1vglrPb0EhgLul8NwULMw60TbXRniGkdQui88vfsm3udiMAKFK9d3g= 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 1588145681615705.9635940016775; Wed, 29 Apr 2020 00:34:41 -0700 (PDT) Received: from localhost ([::1]:41858 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jThEt-0004LO-9q for importer@patchew.org; Wed, 29 Apr 2020 03:34:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46234) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTh24-0007u9-Hz for qemu-devel@nongnu.org; Wed, 29 Apr 2020 03:22:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTh1i-0003ys-Eh for qemu-devel@nongnu.org; Wed, 29 Apr 2020 03:21:24 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:28536 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jTh1h-0003uw-2o for qemu-devel@nongnu.org; Wed, 29 Apr 2020 03:21:01 -0400 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-168-obsKFwb1NdOtZcsdgx2o2Q-1; Wed, 29 Apr 2020 03:20:54 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BBB55835B44; Wed, 29 Apr 2020 07:20:53 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-6.ams2.redhat.com [10.36.113.6]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 87DD95C1BE; Wed, 29 Apr 2020 07:20:53 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5424311358D4; Wed, 29 Apr 2020 09:20:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588144857; 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=5n34gq+3RmHjy+dXJz5n6EkI7iwJ+vPmZrsqkO05GB4=; b=TvTxkeT5i6g2F9gtC/YiWu3gOHezvVm6AfJFFefSdKAf3NUY0tFtUCdjcEYeu3+dTcYOoj gNn2rLFMIo7m4F5GWIaxfguKqOIYX56YJHfogXzhpIaJOJ4fGtDULxNLxuNT61t9zvp/M5 hxl9YHk54B9bXybCKrj2dXWt0ZNmps4= X-MC-Unique: obsKFwb1NdOtZcsdgx2o2Q-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 23/32] qga: Fix qmp_guest_get_memory_blocks() error handling Date: Wed, 29 Apr 2020 09:20:39 +0200 Message-Id: <20200429072048.29963-24-armbru@redhat.com> In-Reply-To: <20200429072048.29963-1-armbru@redhat.com> References: <20200429072048.29963-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=205.139.110.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 01:42:37 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: Michael Roth 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" The Error ** argument must be NULL, &error_abort, &error_fatal, or a pointer to a variable containing NULL. Passing an argument of the latter kind twice without clearing it in between is wrong: if the first call sets an error, it no longer points to NULL for the second call. qmp_guest_get_memory_blocks() passes &local_err to transfer_memory_block() in a loop. If this fails in more than one iteration, it can trip error_setv()'s assertion. Fix it to break the loop. Cc: Michael Roth Signed-off-by: Markus Armbruster Message-Id: <20200422130719.28225-14-armbru@redhat.com> Reviewed-by: Eric Blake --- qga/commands-posix.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index a52af0315f..ae1348dc8f 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -2518,6 +2518,9 @@ GuestMemoryBlockList *qmp_guest_get_memory_blocks(Err= or **errp) mem_blk->phys_index =3D strtoul(&de->d_name[6], NULL, 10); mem_blk->has_can_offline =3D true; /* lolspeak ftw */ transfer_memory_block(mem_blk, true, NULL, &local_err); + if (local_err) { + break; + } =20 entry =3D g_malloc0(sizeof *entry); entry->value =3D mem_blk; --=20 2.21.1