From nobody Sun May 19 19:10:14 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1575517942; cv=none; d=zohomail.com; s=zohoarc; b=JMSPHyCOxxYLWHhA6xEeBdDRSlAxIEhnOrV/Ktp8WXzIkFsQ6g1602qxqIkkfZPn2FujXLjVda4R7E4vpzvy0sNw2Y9TfUdjgNFRwwHPuoWfqEa9eU/2V+qSUd/MaQHmH4my0UfMqTWcsg6STLRZ5RJ9KZzBMxPkRxDXl1DOR0E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575517942; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+c3giVqpjurtEeXz8kohxFqHnw45tLZ6L5Hz3ae1+Mo=; b=NUQMYZqabXexuDwnWab014VWIAwKBZOJvCZJRMaHSchhHO5/H+VUS7Hv5j3DkPpJUWIJbhGMAt60rHbLYBrMWsBVK5Fd9FzbZJ5ki3cI3Sl7JDBo7GOqn7Wu7LXiS5AnslSO65DPr1aXRBBEe7q6HjVBdwUiHgKT52sLqYp4Ask= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1575517942881388.26510094951243; Wed, 4 Dec 2019 19:52:22 -0800 (PST) Received: from localhost ([::1]:49634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iciBh-0003Pn-JI for importer@patchew.org; Wed, 04 Dec 2019 22:52:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45832) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ici5n-0006Qz-ME for qemu-devel@nongnu.org; Wed, 04 Dec 2019 22:46:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ici5m-0003zg-DP for qemu-devel@nongnu.org; Wed, 04 Dec 2019 22:46:15 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:2214 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ici5e-0003iG-8A; Wed, 04 Dec 2019 22:46:06 -0500 Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 66AAEE0F3FCDB6FA77B1; Thu, 5 Dec 2019 11:45:56 +0800 (CST) Received: from HGHY2P002143101.china.huawei.com (10.184.39.213) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.439.0; Thu, 5 Dec 2019 11:45:48 +0800 From: To: , , Subject: [PATCH v5 1/2] block/nbd: extract the common cleanup code Date: Thu, 5 Dec 2019 11:45:27 +0800 Message-ID: <1575517528-44312-2-git-send-email-pannengyuan@huawei.com> X-Mailer: git-send-email 2.7.2.windows.1 In-Reply-To: <1575517528-44312-1-git-send-email-pannengyuan@huawei.com> References: <1575517528-44312-1-git-send-email-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.184.39.213] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.190 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: liyiting@huawei.com, zhang.zhanghailiang@huawei.com, qemu-block@nongnu.org, Pan Nengyuan , qemu-devel@nongnu.org, kuhn.chenqun@huawei.com, Stefano Garzarella Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Pan Nengyuan The BDRVNBDState cleanup code is common in two places, add nbd_clear_bdrvstate() function to do these cleanups. Signed-off-by: Stefano Garzarella Signed-off-by: Pan Nengyuan Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake Suggested-by: Stefano Garzarella --- v3: - new patch, split form 2/2 patch (suggested by Stefano Garzarella) Changes v4 to v3: - replace function name from nbd_free_bdrvstate_prop to nbd_clear_bdrvstate and set cleared fields to NULL (suggested by Eric Blake) - remove static function prototype. (suggested by Eric Blake) --- Changes v5 to v4: - correct the wrong email address --- block/nbd.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 1239761..8b4a65a 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -94,6 +94,19 @@ typedef struct BDRVNBDState { =20 static int nbd_client_connect(BlockDriverState *bs, Error **errp); =20 +void nbd_clear_bdrvstate(BDRVNBDState *s) +{ + object_unref(OBJECT(s->tlscreds)); + qapi_free_SocketAddress(s->saddr); + s->saddr =3D NULL; + g_free(s->export); + s->export =3D NULL; + g_free(s->tlscredsid); + s->tlscredsid =3D NULL; + g_free(s->x_dirty_bitmap); + s->x_dirty_bitmap =3D NULL; +} + static void nbd_channel_error(BDRVNBDState *s, int ret) { if (ret =3D=3D -EIO) { @@ -1855,10 +1868,7 @@ static int nbd_process_options(BlockDriverState *bs,= QDict *options, =20 error: if (ret < 0) { - object_unref(OBJECT(s->tlscreds)); - qapi_free_SocketAddress(s->saddr); - g_free(s->export); - g_free(s->tlscredsid); + nbd_clear_bdrvstate(s); } qemu_opts_del(opts); return ret; @@ -1937,12 +1947,7 @@ static void nbd_close(BlockDriverState *bs) BDRVNBDState *s =3D bs->opaque; =20 nbd_client_close(bs); - - object_unref(OBJECT(s->tlscreds)); - qapi_free_SocketAddress(s->saddr); - g_free(s->export); - g_free(s->tlscredsid); - g_free(s->x_dirty_bitmap); + nbd_clear_bdrvstate(s); } =20 static int64_t nbd_getlength(BlockDriverState *bs) --=20 2.7.2.windows.1 From nobody Sun May 19 19:10:14 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1575518079; cv=none; d=zohomail.com; s=zohoarc; b=ZlMariCHMUDFSIZHwGoLLFfwAlbH/vtc8/rJDr8ZNADGWugstTEigIQ6S2K27ZQr6FEirnsKOlXyNDy70HMlauRURlQwGXSlC/GAI3RTzpwXhtTVZUcrHzeWKPOTAn+h9wuWGMtkBEXZlKemPEXgx0polioY+nfLhtmapR6axRk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575518079; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IcO/3xzfvRt1XIe2yJfYybxhE/eVjsGvzSdaHwJQfPQ=; b=a3yNBMLc4atVVXWjbJeqTIj5A5/rpph0MLg/X6rroxmYquiqayPcS+nalHUwpGTjahzHm3Ij/x2+WOPioT/HsZSEcShZ5QZLF2RaYUyhqqC98JNnZBPEHvTJCLHW2O7vCFfnVTu+UgscRzyHjYGBEd7Hz7ph7c07WYfZ1E10ylA= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1575518079349559.1871278309761; Wed, 4 Dec 2019 19:54:39 -0800 (PST) Received: from localhost ([::1]:49646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iciDt-0005Cv-2b for importer@patchew.org; Wed, 04 Dec 2019 22:54:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45751) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ici5n-0006Qa-DI for qemu-devel@nongnu.org; Wed, 04 Dec 2019 22:46:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ici5l-0003xb-TM for qemu-devel@nongnu.org; Wed, 04 Dec 2019 22:46:15 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:2213 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ici5e-0003iF-BE; Wed, 04 Dec 2019 22:46:06 -0500 Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 6C297C3899B770F24072; Thu, 5 Dec 2019 11:45:56 +0800 (CST) Received: from HGHY2P002143101.china.huawei.com (10.184.39.213) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.439.0; Thu, 5 Dec 2019 11:45:49 +0800 From: To: , , Subject: [PATCH v5 2/2] block/nbd: fix memory leak in nbd_open() Date: Thu, 5 Dec 2019 11:45:28 +0800 Message-ID: <1575517528-44312-3-git-send-email-pannengyuan@huawei.com> X-Mailer: git-send-email 2.7.2.windows.1 In-Reply-To: <1575517528-44312-1-git-send-email-pannengyuan@huawei.com> References: <1575517528-44312-1-git-send-email-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.184.39.213] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.190 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: liyiting@huawei.com, Vladimir Sementsov-Ogievskiy , zhang.zhanghailiang@huawei.com, qemu-block@nongnu.org, Pan Nengyuan , qemu-devel@nongnu.org, qemu-stable , kuhn.chenqun@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Pan Nengyuan In currently implementation there will be a memory leak when nbd_client_connect() returns error status. Here is an easy way to reproduce: 1. run qemu-iotests as follow and check the result with asan: ./check -raw 143 Following is the asan output backtrack: Direct leak of 40 byte(s) in 1 object(s) allocated from: #0 0x7f629688a560 in calloc (/usr/lib64/libasan.so.3+0xc7560) #1 0x7f6295e7e015 in g_malloc0 (/usr/lib64/libglib-2.0.so.0+0x50015) #2 0x56281dab4642 in qobject_input_start_struct /mnt/sdb/qemu-4.2.0-rc= 0/qapi/qobject-input-visitor.c:295 #3 0x56281dab1a04 in visit_start_struct /mnt/sdb/qemu-4.2.0-rc0/qapi/q= api-visit-core.c:49 #4 0x56281dad1827 in visit_type_SocketAddress qapi/qapi-visit-sockets.= c:386 #5 0x56281da8062f in nbd_config /mnt/sdb/qemu-4.2.0-rc0/block/nbd.c:1= 716 #6 0x56281da8062f in nbd_process_options /mnt/sdb/qemu-4.2.0-rc0/block/= nbd.c:1829 #7 0x56281da8062f in nbd_open /mnt/sdb/qemu-4.2.0-rc0/block/nbd.c:1873 Direct leak of 15 byte(s) in 1 object(s) allocated from: #0 0x7f629688a3a0 in malloc (/usr/lib64/libasan.so.3+0xc73a0) #1 0x7f6295e7dfbd in g_malloc (/usr/lib64/libglib-2.0.so.0+0x4ffbd) #2 0x7f6295e96ace in g_strdup (/usr/lib64/libglib-2.0.so.0+0x68ace) #3 0x56281da804ac in nbd_process_options /mnt/sdb/qemu-4.2.0-rc0/block/= nbd.c:1834 #4 0x56281da804ac in nbd_open /mnt/sdb/qemu-4.2.0-rc0/block/nbd.c:1873 Indirect leak of 24 byte(s) in 1 object(s) allocated from: #0 0x7f629688a3a0 in malloc (/usr/lib64/libasan.so.3+0xc73a0) #1 0x7f6295e7dfbd in g_malloc (/usr/lib64/libglib-2.0.so.0+0x4ffbd) #2 0x7f6295e96ace in g_strdup (/usr/lib64/libglib-2.0.so.0+0x68ace) #3 0x56281dab41a3 in qobject_input_type_str_keyval /mnt/sdb/qemu-4.2.0-= rc0/qapi/qobject-input-visitor.c:536 #4 0x56281dab2ee9 in visit_type_str /mnt/sdb/qemu-4.2.0-rc0/qapi/qapi-v= isit-core.c:297 #5 0x56281dad0fa1 in visit_type_UnixSocketAddress_members qapi/qapi-vis= it-sockets.c:141 #6 0x56281dad17b6 in visit_type_SocketAddress_members qapi/qapi-visit-s= ockets.c:366 #7 0x56281dad186a in visit_type_SocketAddress qapi/qapi-visit-sockets.c= :393 #8 0x56281da8062f in nbd_config /mnt/sdb/qemu-4.2.0-rc0/block/nbd.c:1716 #9 0x56281da8062f in nbd_process_options /mnt/sdb/qemu-4.2.0-rc0/block/= nbd.c:1829 #10 0x56281da8062f in nbd_open /mnt/sdb/qemu-4.2.0-rc0/block/nbd.c:1873 Fixes: 8f071c9db506e03ab Reported-by: Euler Robot Signed-off-by: Pan Nengyuan Reviewed-by: Vladimir Sementsov-Ogievskiy Cc: qemu-stable Cc: Vladimir Sementsov-Ogievskiy Reviewed-by: Stefano Garzarella --- Changes v2 to v1: - add a new function to do the common cleanups (suggested by Stefano Garzarella). --- Changes v3 to v2: - split in two patches(suggested by Stefano Garzarella) --- Changes v4 to v3: - replace function name from nbd_free_bdrvstate_prop to nbd_clear_bdrvstate and add Fixes tag. --- Changes v5 to v4: - correct the wrong email address --- block/nbd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/nbd.c b/block/nbd.c index 8b4a65a..9062409 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -1891,6 +1891,7 @@ static int nbd_open(BlockDriverState *bs, QDict *opti= ons, int flags, =20 ret =3D nbd_client_connect(bs, errp); if (ret < 0) { + nbd_clear_bdrvstate(s); return ret; } /* successfully connected */ --=20 2.7.2.windows.1