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=-5.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,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 25A05C3815B for ; Mon, 20 Apr 2020 09:35:39 +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 E057720A8B for ; Mon, 20 Apr 2020 09:35:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZM4zVNkV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E057720A8B 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]:60512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQSq2-0004GM-3R for qemu-devel@archiver.kernel.org; Mon, 20 Apr 2020 05:35:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43862 helo=eggs1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQSok-0003PT-TB for qemu-devel@nongnu.org; Mon, 20 Apr 2020 05:34:20 -0400 Received: from Debian-exim by eggs1p.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQSoj-0003im-6K for qemu-devel@nongnu.org; Mon, 20 Apr 2020 05:34:18 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:59298 helo=us-smtp-1.mimecast.com) by eggs1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jQSoh-0003gt-8D for qemu-devel@nongnu.org; Mon, 20 Apr 2020 05:34:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587375254; h=from:from:reply-to: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=+wRbyZJtD89Qzdg9t92Gka/kVVGfRwXn/VB2ORSHPVk=; b=ZM4zVNkV334u66R351KMoORd+SKNE+OvKjzTU2J2p3NaeYAjfcafzcCIn68Fmlz//rymxc OfGfwg+p0sQ+Htyl+HPSQadjooput1TCpwqzYWUgWu00hlwFcsup17R1WXglK2ZgNu46hw /lCLgzGKN5r3qn8Tyn0CjGgOlDgeWlQ= 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-102-ybLRZ8gUP1mVbkSTZvs_Sw-1; Mon, 20 Apr 2020 05:34:12 -0400 X-MC-Unique: ybLRZ8gUP1mVbkSTZvs_Sw-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 B67668018A1 for ; Mon, 20 Apr 2020 09:34:11 +0000 (UTC) Received: from redhat.com (unknown [10.36.110.47]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C9B9111A1F3; Mon, 20 Apr 2020 09:34:10 +0000 (UTC) Date: Mon, 20 Apr 2020 10:34:07 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Markus Armbruster Subject: Re: [PATCH 10/11] io: Fix qio_channel_socket_close() error handling Message-ID: <20200420093407.GJ346737@redhat.com> References: <20200420083236.19309-1-armbru@redhat.com> <20200420083236.19309-11-armbru@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200420083236.19309-11-armbru@redhat.com> User-Agent: Mutt/1.13.3 (2020-01-12) 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 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Received-SPF: pass client-ip=205.139.110.120; envelope-from=berrange@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs1p.gnu.org: First seen = 2020/04/20 04:32:42 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: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, Apr 20, 2020 at 10:32:35AM +0200, 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. >=20 > qio_channel_socket_close() passes @errp first to > socket_listen_cleanup(), and then, if closesocket() fails, to > error_setg_errno(). If socket_listen_cleanup() failed, this will trip > the assertion in error_setv(). >=20 > Fix by ignoring a second error. >=20 > Fixes: 73564c407caedf992a1c688b5fea776a8b56ba2a > Cc: Daniel P. Berrang=C3=A9 > Signed-off-by: Markus Armbruster > --- > io/channel-socket.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Reviewed-by: Daniel P. Berrang=C3=A9 Regards, Daniel --=20 |: https://berrange.com -o- https://www.flickr.com/photos/dberrange= :| |: https://libvirt.org -o- https://fstop138.berrange.com= :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange= :|