From: Joseph Qi <joseph.qi@linux.alibaba.com>
To: Edward Adam Davis <eadavis@qq.com>
Cc: jlbec@evilplan.org, l@damenly.org, linux-kernel@vger.kernel.org,
mark@fasheh.com, ocfs2-devel@lists.linux.dev,
syzbot+81092778aac03460d6b7@syzkaller.appspotmail.com,
syzkaller-bugs@googlegroups.com
Subject: Re: [PATCH V3] ocfs2: pass u64 to ocfs2_truncate_inline maybe overflow
Date: Wed, 16 Oct 2024 17:49:52 +0800 [thread overview]
Message-ID: <21d7a0d6-faac-4914-8907-1d7d983953f2@linux.alibaba.com> (raw)
In-Reply-To: <tencent_2D332A9E751B474B521BD22569BA27BB0D08@qq.com>
On 10/16/24 11:22 AM, Edward Adam Davis wrote:
> Syzbot reported a kernel BUG in ocfs2_truncate_inline.
> There are two reasons for this: first, the parameter value passed is greater
> than UINT_MAX, 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 -EFBIG.
>
> Reported-by: syzbot+81092778aac03460d6b7@syzkaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=81092778aac03460d6b7
> Signed-off-by: Edward Adam Davis <eadavis@qq.com>
> ---
> V1 -> V2: move sanity check to ocfs2_remove_inode_range
> V2 -> V3: use ocfs2_max_inline_data_with_xattr return value replace UINT_MAX
>
> fs/ocfs2/file.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
> index ad131a2fc58e..9327aa2f1bf4 100644
> --- a/fs/ocfs2/file.c
> +++ b/fs/ocfs2/file.c
> @@ -1784,6 +1784,12 @@ int ocfs2_remove_inode_range(struct inode *inode,
> return 0;
>
> if (OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL) {
> + int max_inl = ocfs2_max_inline_data_with_xattr(inode->i_sb, di);
Or rename it to 'id_count' refer to 'struct ocfs2_inline_data'.
Better to leave a blank line here.
> + if (byte_start > max_inl || byte_start + byte_len > max_inl) {
> + ret = -EFBIG;
Seems 'EINVAL' is more proper here.
Please do corresponding change in commit log.
> + mlog_errno(ret);
> + goto out;
> + }
Better to leave a blank line.
Thanks,
Joseph
> ret = ocfs2_truncate_inline(inode, di_bh, byte_start,
> byte_start + byte_len, 0);
> if (ret) {
next prev parent reply other threads:[~2024-10-16 9:49 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-09 6:18 [syzbot] [ocfs2?] kernel BUG in ocfs2_truncate_inline syzbot
2024-10-09 9:00 ` Edward Adam Davis
2024-10-09 14:11 ` [syzbot] " syzbot
2024-10-09 15:05 ` [PATCH] ocfs2: pass u64 to ocfs2_truncate_inline maybe overflow Edward Adam Davis
2024-10-10 12:21 ` Joseph Qi
2024-10-10 14:31 ` [PATCH V2] " Edward Adam Davis
2024-10-11 1:07 ` Su Yue
2024-10-11 2:01 ` Joseph Qi
2024-10-16 2:08 ` Joseph Qi
2024-10-16 3:22 ` [PATCH V3] " Edward Adam Davis
2024-10-16 9:49 ` Joseph Qi [this message]
2024-10-16 11:43 ` [PATCH V4] " Edward Adam Davis
2024-10-16 11:47 ` Joseph Qi
2024-10-16 11:54 ` Joseph Qi
2024-10-10 14:32 ` [ocfs2?] kernel BUG in ocfs2_truncate_inline Edward Adam Davis
2024-10-10 16:31 ` [syzbot] " syzbot
2024-10-16 3:29 ` Edward Adam Davis
2024-10-16 4:59 ` [syzbot] " syzbot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=21d7a0d6-faac-4914-8907-1d7d983953f2@linux.alibaba.com \
--to=joseph.qi@linux.alibaba.com \
--cc=eadavis@qq.com \
--cc=jlbec@evilplan.org \
--cc=l@damenly.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark@fasheh.com \
--cc=ocfs2-devel@lists.linux.dev \
--cc=syzbot+81092778aac03460d6b7@syzkaller.appspotmail.com \
--cc=syzkaller-bugs@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®