From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 658D2320A00 for ; Mon, 3 Aug 2026 08:52:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785747180; cv=none; b=MuS3T0X87Mu08M8K5wEcHcvOl5l82SbYfKD8S54JXg8QD/frV+J4sU7pTmutZ2bnExBs8eunINapSAjudRK604jhM2sPNiqQtdKsgJ8UWizU3KvyPiO/VzMmgV8hOgHIEJanBZCGKqPExi24knTX6rkWgWNH3xnmk3Pz0U3JcMA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785747180; c=relaxed/simple; bh=vdk9pokF9LaajixGyU6eYOLsj7syGl0CvKFoc3RLLts=; h=Message-ID:Date:MIME-Version:Cc:Subject:To:References:From: In-Reply-To:Content-Type; b=M5FIhveJBg+HAmcioNe/99pSYKR/4VASolYCNsEhNM5BDo7lK1tTBIUHgon8unM4UJmjGHiOiK7l27YnNIoOFaFNSBpqEkCvvJu2Xe/DMKfiW5h6iqMIvTln2xo+icHz9510P/UmyrDZVtuzwBh0a45qoCmDY/FPxnH3kBaiQbw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Bp8zenbk; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Bp8zenbk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B2251F000E9; Mon, 3 Aug 2026 08:52:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785747179; bh=mKNUy26P5uQrkOfhh2PkOznNV2iZK5OADoT4E7cuioI=; h=Date:Cc:Subject:To:References:From:In-Reply-To; b=Bp8zenbkRrNOYJR4dBI6kPPvzQg8TAe/QF8uccWKOQXquvqJZwhmuX2gzy/m7QvJX MSmc9BkgVX+sDi8Bf1x5UZNd6Ti+qWzrfVV5FZDHP7zooUZS7/vsP43kKjWnUquT6r SgY8IDZ93iDJIa7B/fW5E5qdSOUoX7q9sdoXaw1nc+QXuR2UO8Z1Qs4ScCj6TBdDaq 4T8zQg9SLMloC+P7q64QhNtSimfwfBIRJzh5K0R/gZ1i5dDMY+EEJadakuI2Mg3R5z znC4/G0g9yMyUIZkPvssJKR43J9JOWpiEQWV/wLwV4ahNmyJbdZRKODMOe9J277YNn Lfd+AS5/PlZZQ== Message-ID: <08a3a204-e151-4d55-8141-2bdd5ef4fea5@kernel.org> Date: Mon, 3 Aug 2026 16:52:56 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Cc: chao@kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, qiwenjie@xiaomi.com Subject: Re: [PATCH] f2fs: reject invalid recovered filename lengths To: Wenjie Qi , jaegeuk@kernel.org References: <20260729114156.3348582-1-qiwenjie@xiaomi.com> Content-Language: en-US From: Chao Yu In-Reply-To: <20260729114156.3348582-1-qiwenjie@xiaomi.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 7/29/26 19:41, Wenjie Qi wrote: > Recovery uses raw_inode->i_namelen directly when rebuilding fsynced > dentries. A zero-length name uses no dentry slots, so recovery can > report success without recreating the dentry. > > Treat zero-length and oversized recovered names as corruption, mark > NEED_FSCK, and stop recovery with -EFSCORRUPTED. Do you have a reproducer for this? maybe using inject.f2fs? It will be better to cover those bugs w/ xfsqa testcase, could you please consider to add it? > > Signed-off-by: Wenjie Qi > --- > fs/f2fs/recovery.c | 14 +++++++++++--- > 1 file changed, 11 insertions(+), 3 deletions(-) > > diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c > index 89af8407b667..70cf99efcb3c 100644 > --- a/fs/f2fs/recovery.c > +++ b/fs/f2fs/recovery.c > @@ -126,8 +126,8 @@ static int init_recovered_filename(const struct inode *dir, > fname->disk_name.len = le32_to_cpu(raw_inode->i_namelen); > fname->disk_name.name = raw_inode->i_name; > > - if (WARN_ON(fname->disk_name.len > F2FS_NAME_LEN)) > - return -ENAMETOOLONG; > + if (!fname->disk_name.len || fname->disk_name.len > F2FS_NAME_LEN) unlikely? relocate error handling here? Thanks, > + return -EFSCORRUPTED; > > if (!IS_ENCRYPTED(dir)) { > usr_fname->name = fname->disk_name.name; > @@ -185,8 +185,16 @@ static int recover_dentry(struct inode *inode, struct folio *ifolio, > > dir = entry->inode; > err = init_recovered_filename(dir, raw_inode, &fname, &usr_fname); > - if (err) > + if (err) { > + if (err == -EFSCORRUPTED) { > + f2fs_err(F2FS_I_SB(inode), > + "invalid recovered filename length %u for ino %llu", > + le32_to_cpu(raw_inode->i_namelen), inode->i_ino); > + set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_FSCK); > + f2fs_handle_error(F2FS_I_SB(inode), ERROR_CORRUPTED_INODE); > + } > goto out; > + } > retry: > de = __f2fs_find_entry(dir, &fname, &folio); > if (de && inode->i_ino == le32_to_cpu(de->ino))