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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6D0EC433EF for ; Fri, 3 Dec 2021 06:31:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378582AbhLCGek (ORCPT ); Fri, 3 Dec 2021 01:34:40 -0500 Received: from szxga02-in.huawei.com ([45.249.212.188]:16339 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378580AbhLCGek (ORCPT ); Fri, 3 Dec 2021 01:34:40 -0500 Received: from dggpeml500026.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4J52y90JwLz91bg; Fri, 3 Dec 2021 14:30:41 +0800 (CST) Received: from dggpeml100016.china.huawei.com (7.185.36.216) by dggpeml500026.china.huawei.com (7.185.36.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Fri, 3 Dec 2021 14:31:15 +0800 Received: from [10.174.176.102] (10.174.176.102) by dggpeml100016.china.huawei.com (7.185.36.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Fri, 3 Dec 2021 14:31:14 +0800 Message-ID: <7bd86fda-90f1-601f-05b2-b247b5dd6bed@huawei.com> Date: Fri, 3 Dec 2021 14:31:14 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.2 Subject: [PATCH 6/6] lib/ext2fs: call ext2fs_free_mem() to free &io->name in exception branch From: zhanchengbin To: Theodore Ts'o CC: , , References: <37c58382-9714-7e99-6c4d-01b78cfdbd26@huawei.com> In-Reply-To: <37c58382-9714-7e99-6c4d-01b78cfdbd26@huawei.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.176.102] X-ClientProxiedBy: dggpeml500001.china.huawei.com (7.185.36.227) To dggpeml100016.china.huawei.com (7.185.36.216) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org In the exception branch,if we donot call ext2fs_free_mem() to free &io->name, memory leak will occur. Signed-off-by: zhanchengbin Signed-off-by: Zhiqiang Liu --- lib/ext2fs/test_io.c | 2 ++ lib/ext2fs/undo_io.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/lib/ext2fs/test_io.c b/lib/ext2fs/test_io.c index 480e68fc..6843edbc 100644 --- a/lib/ext2fs/test_io.c +++ b/lib/ext2fs/test_io.c @@ -248,6 +248,8 @@ static errcode_t test_open(const char *name, int flags, io_channel *channel) return 0; cleanup: + if (io && io->name) + ext2fs_free_mem(&io->name); if (io) ext2fs_free_mem(&io); if (data) diff --git a/lib/ext2fs/undo_io.c b/lib/ext2fs/undo_io.c index eb56f53d..0d4915cb 100644 --- a/lib/ext2fs/undo_io.c +++ b/lib/ext2fs/undo_io.c @@ -788,6 +788,8 @@ cleanup: free(data->tdb_file); if (data && data->real) io_channel_close(data->real); + if (io && io->name) + ext2fs_free_mem(&io->name); if (data) ext2fs_free_mem(&data); if (io) -- 2.23.0