From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6F8993B7746 for ; Fri, 3 Apr 2026 11:58:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775217514; cv=none; b=i8zqSwmuYXMjnIl1DYXbDzHDG1UXnJJk9vJbrwYW2L9eow4mH/e4dehHS98LJXuyhaPuc0tzNDDVjyKJTv8pjJSjUJE4U+Xj2HrrU6Fp1XW/rtFZ55U06ONpQkyHSiWk7j02+QcEZBQEJ9zHJhbGkuGbHk/HYwUun5+CZpL80OE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775217514; c=relaxed/simple; bh=bicwKsHvC2UxsH+zyn9ohrV2LsUzzi3uoLgxoxQZUN4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VC4v70sCe7+Yg8xZcnMftyRrB7Pabu3MmMgqIzqY84X47s7N4gSOtFl8JyaAYU724pos6XDHGkC/kpkXNjYfJEE/yQgs6h22DZ5emdyqT1SYU+5BbtWXSSMPNFw4BWP+L+tgqSNRtusHQHaImhwS36NgSjA6GCQ5mrFe9nC5awY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pXHTqBBq; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pXHTqBBq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67714C4CEF7; Fri, 3 Apr 2026 11:58:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775217514; bh=bicwKsHvC2UxsH+zyn9ohrV2LsUzzi3uoLgxoxQZUN4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pXHTqBBqlDnDixnNrZOX+oTySpJQ1h3JHJ17Ks9ZO5PEBxPSMc+6teku9cdrpRT1H zyyaqzMEOP5qtUB6jIUEoz07bVQwvHJDnqfOykvI1+4s0gjsQxVkKnoVPr6icRO2h3 e6itli/JnHOsA70pJUpyhVLuaah6MsCU4LGybn1TcygVPg/NoimENu0FvzlVG46JM+ 1q3LJ4ayVyd7B4t8CRT41NzZHl0n4dA4worgbosLpl5ihXTCxP3phM4h/VcfFqa5Ix chCgYtCyu2BTYcJXK2zN/aXqi4LPz/I3EUP5dCpbytM97uBGxFD7kgSZWqU0Pq0IQW /4IK9l1ld2U+w== From: Sasha Levin To: stable@vger.kernel.org Cc: Baokun Li , Joseph Qi , Zhang Yi , Jan Kara , Theodore Ts'o , stable@kernel.org, Sasha Levin Subject: [PATCH 5.10.y] ext4: fix iloc.bh leak in ext4_fc_replay_inode() error paths Date: Fri, 3 Apr 2026 07:58:31 -0400 Message-ID: <20260403115831.2109038-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026033001-credibly-reclining-650d@gregkh> References: <2026033001-credibly-reclining-650d@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Baokun Li [ Upstream commit ec0a7500d8eace5b4f305fa0c594dd148f0e8d29 ] During code review, Joseph found that ext4_fc_replay_inode() calls ext4_get_fc_inode_loc() to get the inode location, which holds a reference to iloc.bh that must be released via brelse(). However, several error paths jump to the 'out' label without releasing iloc.bh: - ext4_handle_dirty_metadata() failure - sync_dirty_buffer() failure - ext4_mark_inode_used() failure - ext4_iget() failure Fix this by introducing an 'out_brelse' label placed just before the existing 'out' label to ensure iloc.bh is always released. Additionally, make ext4_fc_replay_inode() propagate errors properly instead of always returning 0. Reported-by: Joseph Qi Fixes: 8016e29f4362 ("ext4: fast commit recovery path") Signed-off-by: Baokun Li Reviewed-by: Zhang Yi Reviewed-by: Jan Kara Link: https://patch.msgid.link/20260323060836.3452660-1-libaokun@linux.alibaba.com Signed-off-by: Theodore Ts'o Cc: stable@kernel.org Signed-off-by: Sasha Levin --- fs/ext4/fast_commit.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c index be768ef1fd168..5565ba89b2457 100644 --- a/fs/ext4/fast_commit.c +++ b/fs/ext4/fast_commit.c @@ -1480,19 +1480,21 @@ static int ext4_fc_replay_inode(struct super_block *sb, struct ext4_fc_tl *tl, /* Immediately update the inode on disk. */ ret = ext4_handle_dirty_metadata(NULL, NULL, iloc.bh); if (ret) - goto out; + goto out_brelse; ret = sync_dirty_buffer(iloc.bh); if (ret) - goto out; + goto out_brelse; ret = ext4_mark_inode_used(sb, ino); if (ret) - goto out; + goto out_brelse; /* Given that we just wrote the inode on disk, this SHOULD succeed. */ inode = ext4_iget(sb, ino, EXT4_IGET_NORMAL); if (IS_ERR(inode)) { jbd_debug(1, "Inode not found."); - return -EFSCORRUPTED; + inode = NULL; + ret = -EFSCORRUPTED; + goto out_brelse; } /* @@ -1508,13 +1510,14 @@ static int ext4_fc_replay_inode(struct super_block *sb, struct ext4_fc_tl *tl, ext4_inode_csum_set(inode, ext4_raw_inode(&iloc), EXT4_I(inode)); ret = ext4_handle_dirty_metadata(NULL, NULL, iloc.bh); sync_dirty_buffer(iloc.bh); +out_brelse: brelse(iloc.bh); out: iput(inode); if (!ret) blkdev_issue_flush(sb->s_bdev, GFP_KERNEL); - return 0; + return ret; } /* -- 2.53.0