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,INCLUDES_PATCH, MAILING_LIST_MULTI,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 88894C4332D for ; Fri, 20 Mar 2020 17:50:17 +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 59D7920663 for ; Fri, 20 Mar 2020 17:50:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="UnD4FOm2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 59D7920663 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]:57109 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFLmi-000662-DU for qemu-devel@archiver.kernel.org; Fri, 20 Mar 2020 13:50:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37007) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFLll-0005Ou-7V for qemu-devel@nongnu.org; Fri, 20 Mar 2020 13:49:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jFLlj-0006lS-OH for qemu-devel@nongnu.org; Fri, 20 Mar 2020 13:49:16 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:54405) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jFLlj-0006ko-Hk for qemu-devel@nongnu.org; Fri, 20 Mar 2020 13:49:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584726554; 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=Nk/kuobk77OjHYMYbmyG58ebRADsuNXRy5H67bHymkg=; b=UnD4FOm2ZUXaAA+toY+V/WIgS1Gb/ZC5jHplrhlEGbwLPnjM8nedJbtLE1tX+gTM+pWbXp 2bmYnxkh5Qkp758ef5e5PRFGm8sg8lI8RTL2aOqjHsMWG5/k4o2HEsLpR53nSXBfwlrvyN CQe9VgKt9K3oPGbVsQf4P7KU86W2588= 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-55-_6YinEzjP8iBgcWMHIU1fw-1; Fri, 20 Mar 2020 13:49:12 -0400 X-MC-Unique: _6YinEzjP8iBgcWMHIU1fw-1 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 0FFEF107ACC4; Fri, 20 Mar 2020 17:49:11 +0000 (UTC) Received: from redhat.com (ovpn-114-3.ams2.redhat.com [10.36.114.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5CC155D9CD; Fri, 20 Mar 2020 17:49:09 +0000 (UTC) Date: Fri, 20 Mar 2020 17:49:01 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: "Dr. David Alan Gilbert" Subject: Re: [PATCH] monitor/hmp-cmds: fix bad indentation in 'info migrate_parameters' cmd output Message-ID: <20200320174901.GO2608355@redhat.com> References: <20200320130013.418557-1-maozhongyi@cmss.chinamobile.com> <878sjv11xm.fsf@dusky.pond.sub.org> <20200320173117.GE3464@work-vm> MIME-Version: 1.0 In-Reply-To: <20200320173117.GE3464@work-vm> User-Agent: Mutt/1.13.3 (2020-01-12) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 216.205.24.74 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: Markus Armbruster , Mao Zhongyi , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, Mar 20, 2020 at 05:31:17PM +0000, Dr. David Alan Gilbert wrote: > (Rearranging the text a bit) >=20 > * Markus Armbruster (armbru@redhat.com) wrote: >=20 > > David (cc'ed) should be able to tell us which fix is right. > >=20 > > @tls_creds and @tls_hostname look like they could have the same issue. >=20 > A certain Markus removed the Null checks in 8cc99dc because 4af245d > guaranteed they would be None-Null for tls-creds/hostname - so we > should be OK for those. >=20 > But tls-authz came along a lot later in d2f1d29 and doesn't > seem to have the initialisation, which is now in > migration_instance_init. >=20 > So I *think* the fix for this is to do the modern equivalent of 4af245d > : >=20 > diff --git a/migration/migration.c b/migration/migration.c > index c1d88ace7f..0bc1b93277 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -3686,6 +3686,7 @@ static void migration_instance_init(Object *obj) > =20 > params->tls_hostname =3D g_strdup(""); > params->tls_creds =3D g_strdup(""); > + params->tls_authz =3D g_strdup(""); > =20 > /* Set has_* up only for parameter checks */ > params->has_compress_level =3D true; >=20 > Copying in Dan to check that wouldn't break tls. It *will* break TLS, because it will cause the TLS code to lookup an object with the ID of "". NULL must be preserved when calling the TLS APIs. The assignment of "" to tls_hostname would also have broken TLS, so the migration_tls_channel_connect method had to turn it back into a real NULL. The use of "" for tls_creds will similarly cause it to try and lookup an object with ID of "", and fail. That one's harmless though, because it would also fail if it were NULL. 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= :|