From nobody Wed May 1 15:32:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1522246458041816.2215490220619; Wed, 28 Mar 2018 07:14:18 -0700 (PDT) Received: from localhost ([::1]:39490 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1Bq7-0008Q6-5r for importer@patchew.org; Wed, 28 Mar 2018 10:14:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1Blp-0003Qu-C2 for qemu-devel@nongnu.org; Wed, 28 Mar 2018 10:09:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f1Blj-0005CY-Kd for qemu-devel@nongnu.org; Wed, 28 Mar 2018 10:09:45 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:48900 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f1Ble-00059x-Qk; Wed, 28 Mar 2018 10:09:34 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 75EE5406804F; Wed, 28 Mar 2018 14:09:34 +0000 (UTC) Received: from localhost (ovpn-121-230.rdu2.redhat.com [10.10.121.230]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9F50210B2B2B; Wed, 28 Mar 2018 14:09:29 +0000 (UTC) From: Jeff Cody To: qemu-devel@nongnu.org Date: Wed, 28 Mar 2018 10:09:26 -0400 Message-Id: <8172e5c57529e2275e5d8f1cbe06bd9bc88a8dd4.1522245129.git.jcody@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Wed, 28 Mar 2018 14:09:34 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Wed, 28 Mar 2018 14:09:34 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jcody@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 1/1] blockjob: leak fix, remove from txn when failing early X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, marcandre.lureau@redhat.com, jsnow@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Marc-Andr\ufffd\ufffd Lureau This fixes leaks found by ASAN such as: GTESTER tests/test-blockjob =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D31442=3D=3DERROR: LeakSanitizer: detected memory leaks Direct leak of 24 byte(s) in 1 object(s) allocated from: #0 0x7f88483cba38 in __interceptor_calloc (/lib64/libasan.so.4+0xdea38) #1 0x7f8845e1bd77 in g_malloc0 ../glib/gmem.c:129 #2 0x7f8845e1c04b in g_malloc0_n ../glib/gmem.c:360 #3 0x5584d2732498 in block_job_txn_new /home/elmarco/src/qemu/blockjob.= c:172 #4 0x5584d2739b28 in block_job_create /home/elmarco/src/qemu/blockjob.c= :973 #5 0x5584d270ae31 in mk_job /home/elmarco/src/qemu/tests/test-blockjob.= c:34 #6 0x5584d270b1c1 in do_test_id /home/elmarco/src/qemu/tests/test-block= job.c:57 #7 0x5584d270b65c in test_job_ids /home/elmarco/src/qemu/tests/test-blo= ckjob.c:118 #8 0x7f8845e40b69 in test_case_run ../glib/gtestutils.c:2255 #9 0x7f8845e40f29 in g_test_run_suite_internal ../glib/gtestutils.c:2339 #10 0x7f8845e40fd2 in g_test_run_suite_internal ../glib/gtestutils.c:23= 51 #11 0x7f8845e411e9 in g_test_run_suite ../glib/gtestutils.c:2426 #12 0x7f8845e3fe72 in g_test_run ../glib/gtestutils.c:1692 #13 0x5584d270d6e2 in main /home/elmarco/src/qemu/tests/test-blockjob.c= :377 #14 0x7f8843641f29 in __libc_start_main (/lib64/libc.so.6+0x20f29) Add an assert to make sure that the job doesn't have associated txn before = free(). [Jeff Cody: N.B., used updated patch provided by John Snow] --- blockjob.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/blockjob.c b/blockjob.c index ef3ed69ff1..c510a9fde5 100644 --- a/blockjob.c +++ b/blockjob.c @@ -204,6 +204,15 @@ void block_job_txn_add_job(BlockJobTxn *txn, BlockJob = *job) block_job_txn_ref(txn); } =20 +static void block_job_txn_del_job(BlockJob *job) +{ + if (job->txn) { + QLIST_REMOVE(job, txn_list); + block_job_txn_unref(job->txn); + job->txn =3D NULL; + } +} + static void block_job_pause(BlockJob *job) { job->pause_count++; @@ -232,6 +241,7 @@ void block_job_unref(BlockJob *job) { if (--job->refcnt =3D=3D 0) { assert(job->status =3D=3D BLOCK_JOB_STATUS_NULL); + assert(!job->txn); BlockDriverState *bs =3D blk_bs(job->blk); QLIST_REMOVE(job, job_list); bs->job =3D NULL; @@ -392,6 +402,7 @@ static void block_job_decommission(BlockJob *job) job->busy =3D false; job->paused =3D false; job->deferred_to_main_loop =3D true; + block_job_txn_del_job(job); block_job_state_transition(job, BLOCK_JOB_STATUS_NULL); block_job_unref(job); } @@ -481,8 +492,7 @@ static int block_job_finalize_single(BlockJob *job) } } =20 - QLIST_REMOVE(job, txn_list); - block_job_txn_unref(job->txn); + block_job_txn_del_job(job); block_job_conclude(job); return 0; } --=20 2.13.6