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 1F6A47DA7F; Wed, 6 Nov 2024 12:32:50 +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=1730896370; cv=none; b=R798PnoX3HMA/3QYsudPlvFuWED5DN0WneFYh0zlH0CcfGicU9PNrkrHLhVmm5rzPK0JB7TlNf0G7l7+NVt18uEkoHJXITFFk46Ym4UbCWYISOlqCjJ0kgPX37f9OlLvCCKve6Y01FaQWZjaM0ZKD1xn3syAfRjJucLo/f4GI2A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730896370; c=relaxed/simple; bh=J2lwHUhHdiPpWhJ9QUnlDFg8KSxpg+3CBfKx2sJi+Xo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fncsdyhoZfkoxXGLjysRfpo0FJtPQQaj/DZqI8vMpTFZbO+uOK9IMDpfnXeSDg0E9dAif1sPk0npYx5C/JyLpx5WsvFdyfOrlnoMHergqCjcVmtnWGAbQu+2vqtGXYHeF3hg7ANRsdpX/of0V61Nq156QOYP67VAkhgsigMM3lo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=IXECJLp0; 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="IXECJLp0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 708F2C4CECD; Wed, 6 Nov 2024 12:32:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730896370; bh=J2lwHUhHdiPpWhJ9QUnlDFg8KSxpg+3CBfKx2sJi+Xo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IXECJLp0lxTzZ1HoIZuNShTyhizncU5OZNGQZe+HwpTzqWEg6lNNrv99wbCiPSY+A NQ1ggUaKzZVahDlLvcNTCc/d5jkjutexBXN7LlrtEff3JIDRdCszUdX/cNvFX+V3fu fkINVV9Ol/uwRauVUUFgqb8sPkDM6fVA1yykAeT4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Edward Adam Davis , syzbot+81092778aac03460d6b7@syzkaller.appspotmail.com, Joseph Qi , Joel Becker , Mark Fasheh , Junxiao Bi , Changwei Ge , Gang He , Jun Piao , Andrew Morton , Sasha Levin Subject: [PATCH 6.11 179/245] ocfs2: pass u64 to ocfs2_truncate_inline maybe overflow Date: Wed, 6 Nov 2024 13:03:52 +0100 Message-ID: <20241106120323.644138801@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241106120319.234238499@linuxfoundation.org> References: <20241106120319.234238499@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Edward Adam Davis [ Upstream commit bc0a2f3a73fcdac651fca64df39306d1e5ebe3b0 ] Syzbot reported a kernel BUG in ocfs2_truncate_inline. There are two reasons for this: first, the parameter value passed is greater than ocfs2_max_inline_data_with_xattr, second, the start and end parameters of ocfs2_truncate_inline are "unsigned int". So, we need to add a sanity check for byte_start and byte_len right before ocfs2_truncate_inline() in ocfs2_remove_inode_range(), if they are greater than ocfs2_max_inline_data_with_xattr return -EINVAL. Link: https://lkml.kernel.org/r/tencent_D48DB5122ADDAEDDD11918CFB68D93258C07@qq.com Fixes: 1afc32b95233 ("ocfs2: Write support for inline data") Signed-off-by: Edward Adam Davis Reported-by: syzbot+81092778aac03460d6b7@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=81092778aac03460d6b7 Reviewed-by: Joseph Qi Cc: Joel Becker Cc: Joseph Qi Cc: Mark Fasheh Cc: Junxiao Bi Cc: Changwei Ge Cc: Gang He Cc: Jun Piao Cc: Signed-off-by: Andrew Morton Signed-off-by: Sasha Levin --- fs/ocfs2/file.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index ccc57038a9779..02d2beb7ddb95 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -1783,6 +1783,14 @@ int ocfs2_remove_inode_range(struct inode *inode, return 0; if (OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL) { + int id_count = ocfs2_max_inline_data_with_xattr(inode->i_sb, di); + + if (byte_start > id_count || byte_start + byte_len > id_count) { + ret = -EINVAL; + mlog_errno(ret); + goto out; + } + ret = ocfs2_truncate_inline(inode, di_bh, byte_start, byte_start + byte_len, 0); if (ret) { -- 2.43.0