From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B7B7C54FCB for ; Wed, 22 Apr 2020 13:16:43 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C649B2077D for ; Wed, 22 Apr 2020 13:16:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gyWb64bU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C649B2077D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRFF3-0001Be-Sx for qemu-devel@archiver.kernel.org; Wed, 22 Apr 2020 09:16:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50470) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRFD3-0007BM-Ug for qemu-devel@nongnu.org; Wed, 22 Apr 2020 09:14:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRFD2-0002Xu-Vb for qemu-devel@nongnu.org; Wed, 22 Apr 2020 09:14:37 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:53248 helo=us-smtp-delivery-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 1jRFD2-0002UX-GV for qemu-devel@nongnu.org; Wed, 22 Apr 2020 09:14:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587561275; 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=pwbj73tQpCexd+osvs/hutlHUhM/raO3NFZx6+OxvOM=; b=gyWb64bUW0jWqyGyyV/JPTuyjikAJ25aOy4yxEUNuH2e8pDzIkMUOVvpwHWb+trdwx/aow z8Si1fNUGXgYbc3Lyw8Ptk3J23nMjeNlixbearlWaopzWuANUmQ14lDrPaMcda+6kFNROS MALLj3jgts2tjRLaax1QtmJiyX+Tp8E= 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-88-Wg9PccM-PHyK18iTRIeGww-1; Wed, 22 Apr 2020 09:14:29 -0400 X-MC-Unique: Wg9PccM-PHyK18iTRIeGww-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EF7EF8EB020; Wed, 22 Apr 2020 13:14:28 +0000 (UTC) Received: from [10.10.116.80] (ovpn-116-80.rdu2.redhat.com [10.10.116.80]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B9C985D753; Wed, 22 Apr 2020 13:14:26 +0000 (UTC) Subject: Re: [PATCH v2 13/14] qga: Fix qmp_guest_get_memory_blocks() error handling To: Markus Armbruster , qemu-devel@nongnu.org References: <20200422130719.28225-1-armbru@redhat.com> <20200422130719.28225-14-armbru@redhat.com> From: Eric Blake Organization: Red Hat, Inc. Message-ID: Date: Wed, 22 Apr 2020 08:14:25 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200422130719.28225-14-armbru@redhat.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=205.139.110.61; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/22 02:57:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] 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: Michael Roth Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 4/22/20 8:07 AM, Markus Armbruster wrote: > 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 > --- > qga/commands-posix.c | 3 +++ > 1 file changed, 3 insertions(+) > Reviewed-by: Eric Blake > 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(Error **errp) > mem_blk->phys_index = strtoul(&de->d_name[6], NULL, 10); > mem_blk->has_can_offline = true; /* lolspeak ftw */ > transfer_memory_block(mem_blk, true, NULL, &local_err); > + if (local_err) { > + break; > + } > > entry = g_malloc0(sizeof *entry); > entry->value = mem_blk; > -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org