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=-11.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 1485EC43461 for ; Mon, 14 Sep 2020 09:28:13 +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 7C72520719 for ; Mon, 14 Sep 2020 09:28:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="iah5emSc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7C72520719 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]:54296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHkmR-0008Pr-AI for qemu-devel@archiver.kernel.org; Mon, 14 Sep 2020 05:28:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHkli-00080J-6x for qemu-devel@nongnu.org; Mon, 14 Sep 2020 05:27:26 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:36724 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 1kHklg-0001gm-3f for qemu-devel@nongnu.org; Mon, 14 Sep 2020 05:27:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600075643; 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=hy+sHhBtelkHXqtSBSZcytybVtH5keYhINtus9YeATc=; b=iah5emScrNRSe8mwlElB4a3Aa7JWw29yON/sNUS2/aZ0O+CtL5m2b10v9GPDJDGBNKlY1V 2HPGqE/N9537SFVqyu2JUV1/ai7Z500NqzGZj5bBtaQ6H6HxkWNSg6ZrmFlO1oO25aq/Ww +TF5nFPNbnh7bhZhS7lez4osSOQcEcw= 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-507-lBNrz8SiOeqorMr3YeV9fA-1; Mon, 14 Sep 2020 05:27:07 -0400 X-MC-Unique: lBNrz8SiOeqorMr3YeV9fA-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 E5B9110BBECA; Mon, 14 Sep 2020 09:27:05 +0000 (UTC) Received: from redhat.com (ovpn-114-99.ams2.redhat.com [10.36.114.99]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 74DF47512A; Mon, 14 Sep 2020 09:27:02 +0000 (UTC) Date: Mon, 14 Sep 2020 10:26:59 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Zheng Chuan Subject: Re: [PATCH v3 3/6] migration/tls: add MigrationState and tls_hostname into MultiFDSendParams Message-ID: <20200914092659.GF1252186@redhat.com> References: <1599965256-72150-1-git-send-email-zhengchuan@huawei.com> <1599965256-72150-4-git-send-email-zhengchuan@huawei.com> <20200914090209.GD1252186@redhat.com> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.14.6 (2020-07-11) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0.003 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Disposition: inline Received-SPF: pass client-ip=207.211.31.120; envelope-from=berrange@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/14 01:36:47 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -37 X-Spam_score: -3.8 X-Spam_bar: --- X-Spam_report: (-3.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.695, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: zhang.zhanghailiang@huawei.com, quintela@redhat.com, yuxiating@huawei.com, qemu-devel@nongnu.org, xiexiangyou@huawei.com, dgilbert@redhat.com, alex.chen@huawei.com, jinyan12@huawei.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, Sep 14, 2020 at 05:20:14PM +0800, Zheng Chuan wrote: > > > On 2020/9/14 17:02, Daniel P. Berrangé wrote: > > On Sun, Sep 13, 2020 at 10:47:33AM +0800, Chuan Zheng wrote: > >> MigrationState is need for tls session build and tls hostname is need > >> for tls handshake, add both MigrationState and tls_hostname > >> into MultiFDSendParams. > >> > >> Signed-off-by: Chuan Zheng > >> Signed-off-by: Yan Jin > >> --- > >> migration/multifd.c | 5 +++++ > >> migration/multifd.h | 4 ++++ > >> 2 files changed, 9 insertions(+) > >> > >> diff --git a/migration/multifd.c b/migration/multifd.c > >> index d044120..3e41d9e 100644 > >> --- a/migration/multifd.c > >> +++ b/migration/multifd.c > >> @@ -543,11 +543,14 @@ void multifd_save_cleanup(void) > >> > >> socket_send_channel_destroy(p->c); > >> p->c = NULL; > >> + p->s = NULL; > >> qemu_mutex_destroy(&p->mutex); > >> qemu_sem_destroy(&p->sem); > >> qemu_sem_destroy(&p->sem_sync); > >> g_free(p->name); > >> p->name = NULL; > >> + g_free(p->tls_hostname); > >> + p->tls_hostname = NULL; > >> multifd_pages_clear(p->pages); > >> p->pages = NULL; > >> p->packet_len = 0; > >> @@ -779,6 +782,8 @@ int multifd_save_setup(Error **errp) > >> p->packet->magic = cpu_to_be32(MULTIFD_MAGIC); > >> p->packet->version = cpu_to_be32(MULTIFD_VERSION); > >> p->name = g_strdup_printf("multifdsend_%d", i); > >> + p->s = migrate_get_current(); > >> + p->tls_hostname = g_strdup(p->s->hostname); > >> socket_send_channel_create(multifd_new_send_channel_async, p); > >> } > >> > >> diff --git a/migration/multifd.h b/migration/multifd.h > >> index 448a03d..2b400e7 100644 > >> --- a/migration/multifd.h > >> +++ b/migration/multifd.h > >> @@ -66,11 +66,15 @@ typedef struct { > >> } MultiFDPages_t; > >> > >> typedef struct { > >> + /* Migration State */ > >> + MigrationState *s; > >> /* this fields are not changed once the thread is created */ > >> /* channel number */ > >> uint8_t id; > >> /* channel thread name */ > >> char *name; > >> + /* tls hostname */ > >> + char *tls_hostname; > > > > Why do we need this, when it is already accessible from the > > MigrationState field you're adding > > > > > > Regards, > > Daniel > > > Hi，Daniel. Thank you for your review. > > This is because i have free hostname in MigrationState field after migrate_fd_connect(s, error). > Since multifd thread creation is async by socket_send_channel_create(), we must record it in MultiFDSendParams > in case of concurrency issues. > > migration_channel_connect > migrate_fd_connect > multifd_save_setup > socket_send_channel_create(multifd_new_send_channel_async, p); / async, do not wait for multifd creation > g_free(s->hostname); > multifd_new_send_channel_async > multifd_channel_connect > multifd_tls_channel_connect > migration_tls_client_create /* UAF happen */ > > As you mentioned in Patch001, i am not sure if it will cause the same concurrency issues if i put hostname in MigrationState field > freed in migrate_fd_cancel. If MigrationState isn't safe to access from the multifd threads, then don't addd it to the struct, as I think that will mislead people into thinking it is ok to use. Only add the hostname. Regards, Daniel -- |: 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 :|