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=-9.6 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 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 652DBC4363A for ; Mon, 26 Oct 2020 09:53:44 +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 B871B2087C for ; Mon, 26 Oct 2020 09:53:43 +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="LJbI+jOP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B871B2087C 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]:55242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kWzCA-00063f-N5 for qemu-devel@archiver.kernel.org; Mon, 26 Oct 2020 05:53:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kWzA1-0003ir-NT for qemu-devel@nongnu.org; Mon, 26 Oct 2020 05:51:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:42074) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kWz9u-000160-JA for qemu-devel@nongnu.org; Mon, 26 Oct 2020 05:51:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603705881; 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=JtBvTBYuFiOb6GeNPX+1IvLQcxRnqQU8PYKj+vwd0+w=; b=LJbI+jOP6CpEdlhC2WP90deIFX+rZWPcKAqVT6/GP8Hf1s4bi2gOZDDnUyKGZXqnSiulhm kW7EWUEw018KEiDWoIcpkRz8KG2ohMaAd5Pco2CoyMmbuRe4eXwKudYlVv1eUZmnhLHp74 Z7GPWbBdpoQcyrAfuFKXUge5kvwQ3fs= 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-377-cOxLbZ42MTyE9AazQD2HUQ-1; Mon, 26 Oct 2020 05:51:19 -0400 X-MC-Unique: cOxLbZ42MTyE9AazQD2HUQ-1 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 668481009E2D; Mon, 26 Oct 2020 09:51:17 +0000 (UTC) Received: from starship (unknown [10.35.206.187]) by smtp.corp.redhat.com (Postfix) with ESMTP id B79EA5B4B3; Mon, 26 Oct 2020 09:51:11 +0000 (UTC) Message-ID: Subject: Re: [PATCH RESEND v2 1/7] tests/migration: fix memleak in wait_command/wait_command_fd From: Maxim Levitsky To: Chen Qun , qemu-devel@nongnu.org, qemu-trivial@nongnu.org Date: Mon, 26 Oct 2020 11:51:09 +0200 In-Reply-To: <20201023061218.2080844-2-kuhn.chenqun@huawei.com> References: <20201023061218.2080844-1-kuhn.chenqun@huawei.com> <20201023061218.2080844-2-kuhn.chenqun@huawei.com> User-Agent: Evolution 3.36.3 (3.36.3-1.fc32) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mlevitsk@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=mlevitsk@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/26 02:39:09 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Cc: lvivier@redhat.com, Thomas Huth , zhang.zhanghailiang@huawei.com, pannengyuan@huawei.com, ganqixin@huawei.com, Euler Robot , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, 2020-10-23 at 14:12 +0800, Chen Qun wrote: > Properly free each command resp to avoid memory leak. > ASAN shows memory leak stack: > > Indirect leak of 2352520 byte(s) in 571 object(s) allocated from: > #0 0x7f6ca3308d4e in __interceptor_calloc (/lib64/libasan.so.5+0x112d4e) > #1 0x7f6ca3127a50 in g_malloc0 (/lib64/libglib-2.0.so.0+0x55a50) > #2 0x557bf3c71d2b in qdict_new ../qobject/qdict.c:29 > #3 0x557bf3c9caba in parse_object ../qobject/json-parser.c:318 > #4 0x557bf3c9ce75 in json_parser_parse ../qobject/json-parser.c:580 > #5 0x557bf3c8c8cf in json_message_process_token ../qobject/json-streamer.c:92 > #6 0x557bf3c9ea59 in json_lexer_feed_char ../qobject/json-lexer.c:313 > #7 0x557bf3c9eeb5 in json_lexer_feed ../qobject/json-lexer.c:350 > #8 0x557bf3c4793a in qmp_fd_receive ../tests/qtest/libqtest.c:608 > #9 0x557bf3c47b58 in qtest_qmp_receive ../tests/qtest/libqtest.c:618 > #10 0x557bf3c44245 in wait_command ../tests/qtest/migration-helpers.c:59 > #11 0x557bf3c445cb in migrate_query_status ../tests/qtest/migration-helpers.c:108 > #12 0x557bf3c44642 in check_migration_status ../tests/qtest/migration-helpers.c:124 > #13 0x557bf3c447e7 in wait_for_migration_status ../tests/qtest/migration-helpers.c:148 > #14 0x557bf3c43b8f in test_migrate_auto_converge ../tests/qtest/migration-test.c:1243 > ...... > > Fix: 5e34005571af5 > > Reported-by: Euler Robot > Signed-off-by: Chen Qun > --- > Cc: Thomas Huth > Cc: Laurent Vivier > Cc: Maxim Levitsky > Cc: Paolo Bonzini > --- > tests/qtest/migration-helpers.c | 16 ++++++++++++---- > 1 file changed, 12 insertions(+), 4 deletions(-) > > diff --git a/tests/qtest/migration-helpers.c b/tests/qtest/migration-helpers.c > index b799dbafb7..4ee26014b7 100644 > --- a/tests/qtest/migration-helpers.c > +++ b/tests/qtest/migration-helpers.c > @@ -32,7 +32,7 @@ static void check_stop_event(QTestState *who) > QDict *wait_command_fd(QTestState *who, int fd, const char *command, ...) > { > va_list ap; > - QDict *resp; > + QDict *resp, *ret; > > va_start(ap, command); > qtest_qmp_vsend_fds(who, &fd, 1, command, ap); > @@ -44,7 +44,11 @@ QDict *wait_command_fd(QTestState *who, int fd, const char *command, ...) > g_assert(!qdict_haskey(resp, "error")); > g_assert(qdict_haskey(resp, "return")); > > - return qdict_get_qdict(resp, "return"); > + ret = qdict_get_qdict(resp, "return"); > + qobject_ref(ret); > + qobject_unref(resp); > + > + return ret; > } > > /* > @@ -53,7 +57,7 @@ QDict *wait_command_fd(QTestState *who, int fd, const char *command, ...) > QDict *wait_command(QTestState *who, const char *command, ...) > { > va_list ap; > - QDict *resp; > + QDict *resp, *ret; > > va_start(ap, command); > resp = qtest_vqmp(who, command, ap); > @@ -64,7 +68,11 @@ QDict *wait_command(QTestState *who, const char *command, ...) > g_assert(!qdict_haskey(resp, "error")); > g_assert(qdict_haskey(resp, "return")); > > - return qdict_get_qdict(resp, "return"); > + ret = qdict_get_qdict(resp, "return"); > + qobject_ref(ret); > + qobject_unref(resp); > + > + return ret; > } > > /* This is a funny one. I was thinking that reference counters in qobject should take care of this. I guess not. Thanks for fixing it. Best regards, Maxim Levitsky