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=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, 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 8F846C282DD for ; Fri, 10 Jan 2020 14:08:20 +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 5A94420721 for ; Fri, 10 Jan 2020 14:08:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="MBlnNjMQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5A94420721 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]:45898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipuxX-0005Zk-Cq for qemu-devel@archiver.kernel.org; Fri, 10 Jan 2020 09:08:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45335) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipuwn-0004qS-Vq for qemu-devel@nongnu.org; Fri, 10 Jan 2020 09:07:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipuwl-0007KY-Gz for qemu-devel@nongnu.org; Fri, 10 Jan 2020 09:07:32 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:29929 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ipuwl-0007Hc-Bx for qemu-devel@nongnu.org; Fri, 10 Jan 2020 09:07:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578665250; 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:openpgp:openpgp; bh=dceowFlW4KsMiLnA087lp5b5jQych2KtMl/5lGk8pyI=; b=MBlnNjMQmlLDsDYRZvXhAoJcYikG066qUYJWB/jDz34c7tRF5F3H8+1CzpNAVo5c07Uon5 P2WGqKOgns8yPd2Gd9rAzo8kkvuI7coR25RpbYUUG5WHc0zpDnRQCsJKm3V/3U3lfVgLb5 F4sz8ENX1kvKxJqOE3erDxxWZoFGqo8= 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-302-_KiygZNfM6KZZQBkM2L7WQ-1; Fri, 10 Jan 2020 09:07:27 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 14AE410829D5; Fri, 10 Jan 2020 14:07:26 +0000 (UTC) Received: from thuth.remote.csb (ovpn-116-154.ams2.redhat.com [10.36.116.154]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C736678E77; Fri, 10 Jan 2020 14:07:24 +0000 (UTC) Subject: Re: [PATCH V2] vhost-user-test: fix a memory leak To: pannengyuan@huawei.com, lvivier@redhat.com, pbonzini@redhat.com References: <1576805214-2508-1-git-send-email-pannengyuan@huawei.com> From: Thomas Huth Openpgp: preference=signencrypt Message-ID: <072970b5-b7cc-ad71-d3e4-933e888b7093@redhat.com> Date: Fri, 10 Jan 2020 15:07:23 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <1576805214-2508-1-git-send-email-pannengyuan@huawei.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: _KiygZNfM6KZZQBkM2L7WQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] 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: , Cc: zhang.zhanghailiang@huawei.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 20/12/2019 02.26, pannengyuan@huawei.com wrote: > From: Pan Nengyuan > > Spotted by ASAN. > > Reported-by: Euler Robot > Signed-off-by: Pan Nengyuan > --- > Changes V2 to V1: > - use a "goto cleanup", instead of duplicating the "free" functions. > - free "dest_cmdline" at the end. > --- > tests/vhost-user-test.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c > index 91ea373..dcb8617 100644 > --- a/tests/vhost-user-test.c > +++ b/tests/vhost-user-test.c > @@ -717,7 +717,7 @@ static void test_migrate(void *obj, void *arg, QGuestAllocator *alloc) > guint64 size; > > if (!wait_for_fds(s)) { > - return; > + goto cleanup; > } > > size = get_log_size(s); > @@ -776,8 +776,11 @@ static void test_migrate(void *obj, void *arg, QGuestAllocator *alloc) > g_source_unref(source); > > qtest_quit(to); > + > + cleanup: > test_server_free(dest); > g_free(uri); > + g_string_free(dest_cmdline, true); > } > > static void wait_for_rings_started(TestServer *s, size_t count) > Reviewed-by: Thomas Huth ... and picked up to my qtest-next tree.