From nobody Thu Apr 2 20:00:40 2026 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 976CCC32771 for ; Wed, 21 Sep 2022 06:30:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229877AbiIUGaB (ORCPT ); Wed, 21 Sep 2022 02:30:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229624AbiIUG3z (ORCPT ); Wed, 21 Sep 2022 02:29:55 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68C541583D; Tue, 20 Sep 2022 23:29:54 -0700 (PDT) Received: from canpemm500010.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MXT125Y7RzMnGM; Wed, 21 Sep 2022 14:25:10 +0800 (CST) Received: from huawei.com (10.175.127.227) by canpemm500010.china.huawei.com (7.192.105.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 21 Sep 2022 14:29:51 +0800 From: Ye Bin To: , , CC: , , Ye Bin Subject: [PATCH -next v2 1/3] ext4: fix potential memory leak in ext4_fc_record_modified_inode() Date: Wed, 21 Sep 2022 14:40:38 +0800 Message-ID: <20220921064040.3693255-2-yebin10@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220921064040.3693255-1-yebin10@huawei.com> References: <20220921064040.3693255-1-yebin10@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To canpemm500010.china.huawei.com (7.192.105.118) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As krealloc may return NULL, in this case 'state->fc_modified_inodes' may not be freed by krealloc, but 'state->fc_modified_inodes' already set NULL. Then will lead to 'state->fc_modified_inodes' memory leak. Signed-off-by: Ye Bin Reviewed-by: Jan Kara --- fs/ext4/fast_commit.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c index 88575f3d0dc5..29a22ee0adb8 100644 --- a/fs/ext4/fast_commit.c +++ b/fs/ext4/fast_commit.c @@ -1486,13 +1486,15 @@ static int ext4_fc_record_modified_inode(struct sup= er_block *sb, int ino) if (state->fc_modified_inodes[i] =3D=3D ino) return 0; if (state->fc_modified_inodes_used =3D=3D state->fc_modified_inodes_size)= { - state->fc_modified_inodes =3D krealloc( - state->fc_modified_inodes, + int *fc_modified_inodes; + + fc_modified_inodes =3D krealloc(state->fc_modified_inodes, sizeof(int) * (state->fc_modified_inodes_size + EXT4_FC_REPLAY_REALLOC_INCREMENT), GFP_KERNEL); - if (!state->fc_modified_inodes) + if (!fc_modified_inodes) return -ENOMEM; + state->fc_modified_inodes =3D fc_modified_inodes; state->fc_modified_inodes_size +=3D EXT4_FC_REPLAY_REALLOC_INCREMENT; } --=20 2.31.1 From nobody Thu Apr 2 20:00:40 2026 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 54B75ECAAD8 for ; Wed, 21 Sep 2022 06:30:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229606AbiIUGaG (ORCPT ); Wed, 21 Sep 2022 02:30:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229666AbiIUG34 (ORCPT ); Wed, 21 Sep 2022 02:29:56 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87FFB15A18; Tue, 20 Sep 2022 23:29:54 -0700 (PDT) Received: from canpemm500010.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MXT131npDzMnsf; Wed, 21 Sep 2022 14:25:11 +0800 (CST) Received: from huawei.com (10.175.127.227) by canpemm500010.china.huawei.com (7.192.105.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 21 Sep 2022 14:29:52 +0800 From: Ye Bin To: , , CC: , , Ye Bin Subject: [PATCH -next v2 2/3] ext4: fix potential memory leak in ext4_fc_record_regions() Date: Wed, 21 Sep 2022 14:40:39 +0800 Message-ID: <20220921064040.3693255-3-yebin10@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220921064040.3693255-1-yebin10@huawei.com> References: <20220921064040.3693255-1-yebin10@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To canpemm500010.china.huawei.com (7.192.105.118) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As krealloc may return NULL, in this case 'state->fc_regions' may not be freed by krealloc, but 'state->fc_regions' already set NULL. Then will lead to 'state->fc_regions' memory leak. Signed-off-by: Ye Bin Reviewed-by: Jan Kara --- fs/ext4/fast_commit.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c index 29a22ee0adb8..f5b0fc50ed47 100644 --- a/fs/ext4/fast_commit.c +++ b/fs/ext4/fast_commit.c @@ -1679,15 +1679,17 @@ int ext4_fc_record_regions(struct super_block *sb, = int ino, if (replay && state->fc_regions_used !=3D state->fc_regions_valid) state->fc_regions_used =3D state->fc_regions_valid; if (state->fc_regions_used =3D=3D state->fc_regions_size) { + struct ext4_fc_alloc_region *fc_regions; + state->fc_regions_size +=3D EXT4_FC_REPLAY_REALLOC_INCREMENT; - state->fc_regions =3D krealloc( - state->fc_regions, - state->fc_regions_size * - sizeof(struct ext4_fc_alloc_region), - GFP_KERNEL); - if (!state->fc_regions) + fc_regions =3D krealloc(state->fc_regions, + state->fc_regions_size * + sizeof(struct ext4_fc_alloc_region), + GFP_KERNEL); + if (!fc_regions) return -ENOMEM; + state->fc_regions =3D fc_regions; } region =3D &state->fc_regions[state->fc_regions_used++]; region->ino =3D ino; --=20 2.31.1 From nobody Thu Apr 2 20:00:40 2026 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 CA268ECAAD8 for ; Wed, 21 Sep 2022 06:30:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229923AbiIUGaI (ORCPT ); Wed, 21 Sep 2022 02:30:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229831AbiIUG35 (ORCPT ); Wed, 21 Sep 2022 02:29:57 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89AC514D1B; Tue, 20 Sep 2022 23:29:55 -0700 (PDT) Received: from canpemm500010.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4MXT3D4mWzzpTjT; Wed, 21 Sep 2022 14:27:04 +0800 (CST) Received: from huawei.com (10.175.127.227) by canpemm500010.china.huawei.com (7.192.105.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 21 Sep 2022 14:29:52 +0800 From: Ye Bin To: , , CC: , , Ye Bin Subject: [PATCH -next v2 3/3] ext4: update 'state->fc_regions_size' after successful memory allocation Date: Wed, 21 Sep 2022 14:40:40 +0800 Message-ID: <20220921064040.3693255-4-yebin10@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220921064040.3693255-1-yebin10@huawei.com> References: <20220921064040.3693255-1-yebin10@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To canpemm500010.china.huawei.com (7.192.105.118) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" To avoid to 'state->fc_regions_size' mismatch with 'state->fc_regions' when fail to reallocate 'fc_reqions',only update 'state->fc_regions_size' after 'state->fc_regions' is allocated successfully. Signed-off-by: Ye Bin Reviewed-by: Jan Kara --- fs/ext4/fast_commit.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c index f5b0fc50ed47..694ab0627395 100644 --- a/fs/ext4/fast_commit.c +++ b/fs/ext4/fast_commit.c @@ -1681,14 +1681,15 @@ int ext4_fc_record_regions(struct super_block *sb, = int ino, if (state->fc_regions_used =3D=3D state->fc_regions_size) { struct ext4_fc_alloc_region *fc_regions; =20 - state->fc_regions_size +=3D - EXT4_FC_REPLAY_REALLOC_INCREMENT; fc_regions =3D krealloc(state->fc_regions, - state->fc_regions_size * - sizeof(struct ext4_fc_alloc_region), + sizeof(struct ext4_fc_alloc_region) * + (state->fc_regions_size + + EXT4_FC_REPLAY_REALLOC_INCREMENT), GFP_KERNEL); if (!fc_regions) return -ENOMEM; + state->fc_regions_size +=3D + EXT4_FC_REPLAY_REALLOC_INCREMENT; state->fc_regions =3D fc_regions; } region =3D &state->fc_regions[state->fc_regions_used++]; --=20 2.31.1