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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 3B172C77B7D for ; Mon, 15 May 2023 10:24:56 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pyVNc-0003yL-IJ; Mon, 15 May 2023 06:24:36 -0400 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 1pyVNa-0003yA-Dm for qemu-devel@nongnu.org; Mon, 15 May 2023 06:24:34 -0400 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 1pyVNY-0005Vo-Nq for qemu-devel@nongnu.org; Mon, 15 May 2023 06:24:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684146272; 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:in-reply-to:in-reply-to: references:references; bh=ycwK7qdH7B10v/XFqfpqzz1EWZSPqN4yvVXjcsNyfd8=; b=Ii+4skciZC/FXIaCpbqkpXUMuRDPSwsrPbPreJeVOQ6U5/2jbA9NgJ0yoDH57cU+DFKh5i NnjjTrWvybtt933ZLo5VJyHyQ4MallSE1W1NtGgv3os+apmpAAHXeBoYfinRGJT1x/jwZg wBXBQeOf760kgXcrDN761WnbCa/B9Hs= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-369-5UBtnGueNMykrTJBSKI0Qg-1; Mon, 15 May 2023 06:24:30 -0400 X-MC-Unique: 5UBtnGueNMykrTJBSKI0Qg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1B1E188B773; Mon, 15 May 2023 10:24:30 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.48]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9E8AF2026D16; Mon, 15 May 2023 10:24:28 +0000 (UTC) Date: Mon, 15 May 2023 11:24:21 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Het Gala Cc: qemu-devel@nongnu.org, prerna.saxena@nutanix.com, quintela@redhat.com, dgilbert@redhat.com, pbonzini@redhat.com, armbru@redhat.com, eblake@redhat.com, manish.mishra@nutanix.com, aravind.retnakaran@nutanix.com Subject: Re: [PATCH v4 4/8] migration: converts rdma backend to accept MigrateAddress struct Message-ID: References: <20230512143240.192504-1-het.gala@nutanix.com> <20230512143240.192504-5-het.gala@nutanix.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230512143240.192504-5-het.gala@nutanix.com> User-Agent: Mutt/2.2.9 (2022-11-12) X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@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, 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: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Fri, May 12, 2023 at 02:32:36PM +0000, Het Gala wrote: > RDMA based transport backend for 'migrate'/'migrate-incoming' QAPIs > accept new wire protocol of MigrateAddress struct. > > It is achived by parsing 'uri' string and storing migration parameters > required for RDMA connection into well defined InetSocketAddress struct. > > Suggested-by: Aravind Retnakaran > Signed-off-by: Het Gala > --- > migration/migration.c | 8 ++++---- > migration/rdma.c | 38 ++++++++++++++++---------------------- > migration/rdma.h | 6 ++++-- > 3 files changed, 24 insertions(+), 28 deletions(-) > > @@ -3360,10 +3346,12 @@ static int qemu_rdma_accept(RDMAContext *rdma) > .private_data_len = sizeof(cap), > }; > RDMAContext *rdma_return_path = NULL; > + InetSocketAddress *isock = g_new0(InetSocketAddress, 1); > struct rdma_cm_event *cm_event; > struct ibv_context *verbs; > int ret = -EINVAL; > int idx; > + char arr[8]; > > ret = rdma_get_cm_event(rdma->channel, &cm_event); > if (ret) { > @@ -3375,13 +3363,17 @@ static int qemu_rdma_accept(RDMAContext *rdma) > goto err_rdma_dest_wait; > } > > + isock->host = rdma->host; > + sprintf(arr,"%d", rdma->port); > + isock->port = arr; While Inet ports are 16-bit, and so 65535 fits in a char[8], nothing at the QAPI parser level is enforcing this. IOW, someone can pass QEMU a QAPI config with port = 235252353253253253232 and casue this sprintf to smash the stack. Also this is assigning a stack variable to isock->port which expects a heap variable. qapi_free_InetSocketAddress() will call free(isock->port) which will again crash. Just do g_autoptr(InetSocketAddress) isock = g_new0(InetSocketAddress, 1); isock->port = g_strdup_printf("%d", rdma->port); > + > /* > * initialize the RDMAContext for return path for postcopy after first > * connection request reached. > */ > if ((migrate_postcopy() || migrate_return_path()) > && !rdma->is_return_path) { > - rdma_return_path = qemu_rdma_data_init(rdma->host_port, NULL); > + rdma_return_path = qemu_rdma_data_init(isock, NULL); > if (rdma_return_path == NULL) { > rdma_ack_cm_event(cm_event); > goto err_rdma_dest_wait; > @@ -3506,6 +3498,8 @@ static int qemu_rdma_accept(RDMAContext *rdma) > err_rdma_dest_wait: > rdma->error_state = ret; > qemu_rdma_cleanup(rdma); > + qapi_free_InetSocketAddress(isock); > + g_free(arr); Free'ing a stack variable > g_free(rdma_return_path); > return ret; > } > @@ -4114,7 +4108,8 @@ static void rdma_accept_incoming_migration(void *opaque) > } > } > > -void rdma_start_incoming_migration(const char *host_port, Error **errp) > +void rdma_start_incoming_migration(InetSocketAddress *host_port, > + Error **errp) > { > int ret; > RDMAContext *rdma; > @@ -4160,13 +4155,12 @@ err: > error_propagate(errp, local_err); > if (rdma) { > g_free(rdma->host); > - g_free(rdma->host_port); > } > g_free(rdma); > } > > void rdma_start_outgoing_migration(void *opaque, > - const char *host_port, Error **errp) > + InetSocketAddress *host_port, Error **errp) > { > MigrationState *s = opaque; > RDMAContext *rdma_return_path = NULL; > diff --git a/migration/rdma.h b/migration/rdma.h > index de2ba09dc5..ee89296555 100644 > --- a/migration/rdma.h > +++ b/migration/rdma.h > @@ -14,12 +14,14 @@ > * > */ > > +#include "qemu/sockets.h" > + > #ifndef QEMU_MIGRATION_RDMA_H > #define QEMU_MIGRATION_RDMA_H > > -void rdma_start_outgoing_migration(void *opaque, const char *host_port, > +void rdma_start_outgoing_migration(void *opaque, InetSocketAddress *host_port, > Error **errp); > > -void rdma_start_incoming_migration(const char *host_port, Error **errp); > +void rdma_start_incoming_migration(InetSocketAddress *host_port, Error **errp); > > #endif > -- > 2.22.3 > With 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 :|