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 B3B413D9034; Wed, 8 Apr 2026 18:12:00 +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=1775671920; cv=none; b=qGnXZmJIYhV7PmYnQtcQ8wH6/DUkwcAwWb069IxetLNJo4skECb26BjkpKmRR0tleSqsSTlmToiJP1XwpmQgihnFXcg2L/pkzD0iwemEZW2e0aRxShO6ZSeDstfdLkHmufr2Y2g+r7VhVEYuihdLTzMrbJfMFwQclAV38QiWa8E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775671920; c=relaxed/simple; bh=y+ZQnmGH10cFPaa90mOrJOTJLZBN6/oa2LeJlLZTZ8E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iWRITctf3H5NnPEz/mMqrw6CzXs046YgejXGA0DraawEzfr5QB3GCOR/kNBJxv+NhWpoShPO2/GDQfJrpCV1OQeiPGNLD6QLN8A8JRLkj2gETQjTaZVSaxLCjKSlLTgUsgFug+dWQLj/kp6loPZsB/U2SU94E8J9tEU0LfCT8tY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=2VU6zzlO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="2VU6zzlO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 34BA7C19425; Wed, 8 Apr 2026 18:12:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1775671920; bh=y+ZQnmGH10cFPaa90mOrJOTJLZBN6/oa2LeJlLZTZ8E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2VU6zzlOPZL7ED0yScUnS8As8Y7ysUD2zDrS2aF7GSt6SkxwwXBmbKgLpgzRxGLAo X67RS4HTr8Rb0ryUrEre7uDfsRAG2a+0g0MUT5RhTUp7HVm8T8md+6Ai0OSk5rDgbz YJlyVorhW/4wSWwgk99EnMrFfCEe+ycGUn9yJvM4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Joseph Qi , Baokun Li , Zhang Yi , Jan Kara , Theodore Tso , stable@kernel.org Subject: [PATCH 6.1 118/312] ext4: fix iloc.bh leak in ext4_fc_replay_inode() error paths Date: Wed, 8 Apr 2026 20:00:35 +0200 Message-ID: <20260408175938.177076653@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260408175933.715315542@linuxfoundation.org> References: <20260408175933.715315542@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Baokun Li commit ec0a7500d8eace5b4f305fa0c594dd148f0e8d29 upstream. 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: Greg Kroah-Hartman --- fs/ext4/fast_commit.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) --- a/fs/ext4/fast_commit.c +++ b/fs/ext4/fast_commit.c @@ -1623,19 +1623,21 @@ static int ext4_fc_replay_inode(struct s /* 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)) { ext4_debug("Inode not found."); - return -EFSCORRUPTED; + inode = NULL; + ret = -EFSCORRUPTED; + goto out_brelse; } /* @@ -1652,13 +1654,14 @@ static int ext4_fc_replay_inode(struct s 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); - return 0; + return ret; } /*