From nobody Wed Nov 27 02:42:02 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1701340931; cv=none; d=zohomail.com; s=zohoarc; b=KUsMrG6elHFe9vL3rVElA2X//dMe5IxD075J2cMN7oNxrbnurHWH+7Z12pU4wdJ7M6d0h7I8pfXW8uO9vX902vA8o2H0OhehWUDrA8KYpmB3N1KLd/oKT8pi79PRKEcHADJBUPuGTeN+IlfJq+a255tzVSeliRYfHYfZb6AAclc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1701340931; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=gcCCTVK1Z87QQ5nNgkuMaXelRZHuKE6tNmJWlhMclKo=; b=fhxyfvdOkA10gsS6vifjzAb83jmvfGwvkKyz0O5n/OYGUzmtQsUj/eH4v3ydw/6+6VXd2CHKOiqKMz6hMUuLDILXxeX9JiwPSc7v5CPW2738M6acQy1chduBM20MAkwROCdE7lO2S0NYZl5QvPNVVCnpla/cUatxRNOOHRmSptY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1701340931256774.7794085497575; Thu, 30 Nov 2023 02:42:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8eTt-0006Rc-8R; Thu, 30 Nov 2023 05:41:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r8eTq-0006R4-96 for qemu-devel@nongnu.org; Thu, 30 Nov 2023 05:41:14 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r8eTo-0005iw-8c for qemu-devel@nongnu.org; Thu, 30 Nov 2023 05:41:13 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-335-EcaUBrbJMM2i8xHL7G9ciA-1; Thu, 30 Nov 2023 05:41:07 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 48F3D84AC61; Thu, 30 Nov 2023 10:41:07 +0000 (UTC) Received: from secure.mitica1 (unknown [10.39.195.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E6E62026D4C; Thu, 30 Nov 2023 10:41:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701340871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gcCCTVK1Z87QQ5nNgkuMaXelRZHuKE6tNmJWlhMclKo=; b=WuICUDyzUf7b5ytBYDgVeDlJCwnDLo8Of/Um3l4WVO4ILp7FARLz5fd5xM/iGEUMxBlqgG T2CQ7mjvaezbRi6ZxWAEeRMx6WSBmbMkilvsZAPmgJiyhAbSfKI+PQMFXtJmIghh5Hx81P kYF7wv8dSbO7mfPepp4cy0uOMxPzCho= X-MC-Unique: EcaUBrbJMM2i8xHL7G9ciA-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Juan Quintela , Leonardo Bras , Fabiano Rosas , Peter Xu Subject: [PULL 1/2] migration/multifd: Stop setting p->ioc before connecting Date: Thu, 30 Nov 2023 11:41:02 +0100 Message-ID: <20231130104103.28672-2-quintela@redhat.com> In-Reply-To: <20231130104103.28672-1-quintela@redhat.com> References: <20231130104103.28672-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 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=170.10.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1701340932723000004 Content-Type: text/plain; charset="utf-8" From: Fabiano Rosas This is being shadowed but the assignments at multifd_channel_connect() and multifd_tls_channel_connect() . Signed-off-by: Fabiano Rosas Message-ID: <20231110200241.20679-2-farosas@suse.de> Signed-off-by: Juan Quintela --- migration/multifd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/migration/multifd.c b/migration/multifd.c index ec58c58082..409460684f 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -883,8 +883,7 @@ static void multifd_new_send_channel_async(QIOTask *tas= k, gpointer opaque) =20 trace_multifd_new_send_channel_async(p->id); if (!qio_task_propagate_error(task, &local_err)) { - p->c =3D ioc; - qio_channel_set_delay(p->c, false); + qio_channel_set_delay(ioc, false); p->running =3D true; if (multifd_channel_connect(p, ioc, &local_err)) { return; --=20 2.43.0 From nobody Wed Nov 27 02:42:02 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1701340931; cv=none; d=zohomail.com; s=zohoarc; b=XwGpcUK+b+SaitwwB+49eC7DDhg6Z5uwMtYv4Ayx8tcNvawVfPIAL1hfB9WDNaGu8tsi6Wi8kus0kbZ3OigP/RxDiEiBeEmR+GmSWFGMvZFLvJR1PHvSwD7HJ0SvdY4AlOkAcsx8e+wvXsHpcNdPOIhFVdf4LqTM//ZU/ZWKuDc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1701340931; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=h+d/EjlEpu5yyJcRIckcsv2nrrrU/VNYzWeDlmKJFT0=; b=bjRiJ1ohMDMSZgRwKTZ/cXPoD3Euuu2/9K/rSBBJn3cfTUGccuWflSgaRopK3eptNdlyPlAxwQ41+lMNMeFOdv+MyYeOZrxPa3sxmE1xqMpIEpMARbCELOJWCB3QWPQo25I0li0UAARpYzM0MRHvBzjb3spiB3Tkw/Vv4hKsVvU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1701340931486693.3716048030899; Thu, 30 Nov 2023 02:42:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8eTz-0006Tq-0n; Thu, 30 Nov 2023 05:41:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r8eTs-0006Rb-PL for qemu-devel@nongnu.org; Thu, 30 Nov 2023 05:41:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r8eTr-0005jS-8j for qemu-devel@nongnu.org; Thu, 30 Nov 2023 05:41:16 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-142-7MHTsFwUN7qapqyUYGRQhw-1; Thu, 30 Nov 2023 05:41:09 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1885584AC63; Thu, 30 Nov 2023 10:41:09 +0000 (UTC) Received: from secure.mitica1 (unknown [10.39.195.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8CEDE2026D4C; Thu, 30 Nov 2023 10:41:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701340874; 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=h+d/EjlEpu5yyJcRIckcsv2nrrrU/VNYzWeDlmKJFT0=; b=YFPLHLh8+7zQskLta6ls+/x+MKww/7EaUxC3QExrs2TcQjAE4GaR2O82AhxtRSW1IR9OXK u94QlmlSdD5chqq+Gha6GIdQrrAfCkn3ErrUBqh3EZzsTGAnYI0LNuWUnB75vh1nS9dTia zrKgAy5u0/6rMXed+/FbB2dq9wXoBEE= X-MC-Unique: 7MHTsFwUN7qapqyUYGRQhw-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Juan Quintela , Leonardo Bras , Fabiano Rosas , Peter Xu , Zongmin Zhou , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 2/2] migration: free 'saddr' since be no longer used Date: Thu, 30 Nov 2023 11:41:03 +0100 Message-ID: <20231130104103.28672-3-quintela@redhat.com> In-Reply-To: <20231130104103.28672-1-quintela@redhat.com> References: <20231130104103.28672-1-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 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=170.10.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1701340932724000005 From: Zongmin Zhou Since socket_parse() will allocate memory for 'saddr',and its value will pass to 'addr' that allocated by migrate_uri_parse(), then 'saddr' will no longer used,need to free. But due to 'saddr->u' is shallow copying the contents of the union, the members of this union containing allocated strings,and will be used aft= er that. So just free 'saddr' itself without doing a deep free on the contents of th= e SocketAddress. Fixes: 72a8192e225c ("migration: convert migration 'uri' into 'MigrateAddre= ss'") Signed-off-by: Zongmin Zhou Reviewed-by: Juan Quintela Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Peter Xu Signed-off-by: Juan Quintela Message-ID: <20231120031428.908295-1-zhouzongmin@kylinos.cn> --- migration/migration.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 28a34c9068..1832dad618 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -462,7 +462,6 @@ bool migrate_uri_parse(const char *uri, MigrationChanne= l **channel, { g_autoptr(MigrationChannel) val =3D g_new0(MigrationChannel, 1); g_autoptr(MigrationAddress) addr =3D g_new0(MigrationAddress, 1); - SocketAddress *saddr =3D NULL; InetSocketAddress *isock =3D &addr->u.rdma; strList **tail =3D &addr->u.exec.args; =20 @@ -487,12 +486,14 @@ bool migrate_uri_parse(const char *uri, MigrationChan= nel **channel, strstart(uri, "vsock:", NULL) || strstart(uri, "fd:", NULL)) { addr->transport =3D MIGRATION_ADDRESS_TYPE_SOCKET; - saddr =3D socket_parse(uri, errp); + SocketAddress *saddr =3D socket_parse(uri, errp); if (!saddr) { return false; } addr->u.socket.type =3D saddr->type; addr->u.socket.u =3D saddr->u; + /* Don't free the objects inside; their ownership moved to "addr" = */ + g_free(saddr); } else if (strstart(uri, "file:", NULL)) { addr->transport =3D MIGRATION_ADDRESS_TYPE_FILE; addr->u.file.filename =3D g_strdup(uri + strlen("file:")); --=20 2.43.0