The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: Jaegeuk Kim <jaegeuk@kernel.org>
To: Chao Yu <chao@kernel.org>
Cc: Samuel Moelius <sam.moelius@trailofbits.com>,
	"open list:F2FS FILE SYSTEM"
	<linux-f2fs-devel@lists.sourceforge.net>,
	open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] f2fs: validate inline dentry name lengths before conversion
Date: Mon, 15 Jun 2026 15:24:27 +0000	[thread overview]
Message-ID: <ajAZK_e2Em415hME@google.com> (raw)
In-Reply-To: <e7ff2e57-b81f-4195-8e33-062e77b080fe@kernel.org>

On 06/15, Chao Yu wrote:
> On 6/3/26 23:49, Samuel Moelius wrote:
> > Inline dentry conversion copies names out of the inline dentry area
> > before checking that each recorded name length fits in the available
> > filename slots.
> > 
> > A corrupted image can therefore make the conversion path read past
> > the inline filename storage while building the regular dentry block.
> > 
> > Validate each inline dentry name length against the inline filename
> > area before copying it.
> > 
> > Assisted-by: Codex:gpt-5.5-cyber-preview
> > Signed-off-by: Samuel Moelius <sam.moelius@trailofbits.com>
> > ---
> >  fs/f2fs/inline.c | 4 ++++
> >  1 file changed, 4 insertions(+)
> > 
> > diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
> > index 7aabfc9b43cb..4584dfbe3fb8 100644
> > --- a/fs/f2fs/inline.c
> > +++ b/fs/f2fs/inline.c
> > @@ -507,6 +507,10 @@ static int f2fs_add_inline_entries(struct inode *dir, void *inline_dentry)
> >  			bit_pos++;
> >  			continue;
> >  		}
> > +		if (unlikely(le16_to_cpu(de->name_len) > F2FS_NAME_LEN ||
> > +			     bit_pos + GET_DENTRY_SLOTS(le16_to_cpu(de->name_len)) >
> > +			     d.max))
> > +			return -EFSCORRUPTED;
> 
> 	err = -EFSCORRUPTED;
> 	goto punch_dentry_pages;

Applied with it.

> 
> Thanks,
> 
> >  
> >  		/*
> >  		 * We only need the disk_name and hash to move the dentry.
> 

  reply	other threads:[~2026-06-15 15:24 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-03 15:49 [PATCH] f2fs: validate inline dentry name lengths before conversion Samuel Moelius
2026-06-15  3:14 ` Chao Yu
2026-06-15 15:24   ` Jaegeuk Kim [this message]
2026-06-16  2:57     ` Chao Yu
  -- strict thread matches above, loose matches on Subject: below --
2026-06-03 15:11 Samuel Moelius

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=ajAZK_e2Em415hME@google.com \
    --to=jaegeuk@kernel.org \
    --cc=chao@kernel.org \
    --cc=linux-f2fs-devel@lists.sourceforge.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sam.moelius@trailofbits.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