]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ext4: avoid buffer_head leak in ext4_mark_inode_used()
authorKemeng Shi <shikemeng@huaweicloud.com>
Tue, 20 Aug 2024 13:22:28 +0000 (21:22 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 4 Oct 2024 14:32:57 +0000 (16:32 +0200)
[ Upstream commit 5e5b2a56c57def1b41efd49596621504d7bcc61c ]

Release inode_bitmap_bh from ext4_read_inode_bitmap() in
ext4_mark_inode_used() to avoid buffer_head leak.
By the way, remove unneeded goto for invalid ino when inode_bitmap_bh
is NULL.

Fixes: 8016e29f4362 ("ext4: fast commit recovery path")
Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
Link: https://patch.msgid.link/20240820132234.2759926-2-shikemeng@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/ext4/ialloc.c

index e9bbb1da2d0a24d29b0f3f875e4aa96d5cf9d833..bf14450da35f424a0c5c1cf1a62d1ec31151405d 100644 (file)
@@ -755,10 +755,10 @@ int ext4_mark_inode_used(struct super_block *sb, int ino)
        struct ext4_group_desc *gdp;
        ext4_group_t group;
        int bit;
-       int err = -EFSCORRUPTED;
+       int err;
 
        if (ino < EXT4_FIRST_INO(sb) || ino > max_ino)
-               goto out;
+               return -EFSCORRUPTED;
 
        group = (ino - 1) / EXT4_INODES_PER_GROUP(sb);
        bit = (ino - 1) % EXT4_INODES_PER_GROUP(sb);
@@ -860,6 +860,7 @@ int ext4_mark_inode_used(struct super_block *sb, int ino)
        err = ext4_handle_dirty_metadata(NULL, NULL, group_desc_bh);
        sync_dirty_buffer(group_desc_bh);
 out:
+       brelse(inode_bitmap_bh);
        return err;
 }