From nobody Fri Dec 19 12:44:57 2025 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A63A130F80A for ; Wed, 5 Nov 2025 11:09:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762341001; cv=none; b=UV8PCChH5ey6/4iwJQCiw/uyoE1jfMCemWoPS61MHBc0gYabwVJCGs7e7FMbjWblUVfyBUujrTUZxB/gECNWvTAe1a5xsQWdc6T00ORUt/4ZLR4QskHwYYWxIEosZuTkJ5Oy7Nn6yoAeiy9nq2CqFMZHhghRNsv+1mHv/5a8Hjw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762341001; c=relaxed/simple; bh=/Mzq3xJjoScnLlS/YQOCszoPa9oiwh8nNoNQlaFG2vg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Bh3JdnpD1nfjgR+Gymgl7ugpz5DCzNQ1Bmb+Mn2vL34XIidWEA4JZkJrrgVns4k+wXrMeJFOgfHOkOhzIkSwbHxeH8Xu8zk+2e83z5siCWR5T/CCkFtbbp6RYHVayIXen1lne2HPgTFixrjMwfPsidYCWi+xZyyjoO8vrJ0VrIw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Qna4VVlm; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Qna4VVlm" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-47109187c32so34230445e9.2 for ; Wed, 05 Nov 2025 03:09:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762340998; x=1762945798; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s7tqhsuXnKDfa3LKYm+5yorAhNtlPrbMypXt017HtZM=; b=Qna4VVlm5gyPqBFq97q1+93h0D2Q+UGMQKN7MdTrXeX6W72haL5hwtU1KErtd9HCv6 h1bWW6Ga8gozXMhsHBy192i3sXCaPDwC58f9G/wCDdeJZ2jDVW6+d2iJA/e4Ht6f/vMZ 13FNJhdvj3RL1BAoWCiaqOjY2OxJxpDuOhyfw+JHJHhR3tjGk8Dkbz1c2L6VkHYUerMJ Am4GRZiVcl7Cl613zfXto8jMGA8P/M8QhrcCc/t9X2euJn0v3go8DuJUP9obI1BmO07h v/tY+/Lo3WxY5iuFBQKAKCTbHGdDhQuyZExrVHEdDIYQoQnf78YkKxAcDrZu3zhk6bEn rtjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762340998; x=1762945798; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s7tqhsuXnKDfa3LKYm+5yorAhNtlPrbMypXt017HtZM=; b=MeUadqT4Z75M8VVPo/J5OWnFnRwnt2708WAcZdb4gWoSxTNX7DbGysBqDZ3rgx9OhS VzyQHTlxo0XM4tZ1/Xz3RAQ7ox036zqR1JTORYykWdkRM2lBDJVfTX4ldAkyzYNaGLO6 5Ys/kG00s2I3VyXBtelPJ+jGAUV445K3+4oNrRmY74JW86adP3g4awbcIzbQLIeaW4zl leG9y31CKEIyotkwHAy8FCe3wvJRszKZSxcQRRz/xBFa0PP3hcEpaf017X96+xwjYm+k /Uy+2Lzijs2rr7ICMEhGx2okNWWeVAK+YXs3GPTG5IClAbcSe8q8SQIw5QOFWGEtpAgP uS7Q== X-Gm-Message-State: AOJu0Yz9h5L5x5EWAFcyoDzlfJWPNPsX7QpFwYDAIkCzupnQGQORLTYd xDyZlQnE69Msi0bGhd9ES03E6ni+nsgxq4pxN9WEsWkFMyFKHI8DaNnA X-Gm-Gg: ASbGncsMzYk3tDLKO+JLAyFWOOLkgcbAvQR3n/L7AdZn9Vjg41Bzwwfw36bhQ4kGGfc mYMqbFujkY9U18nfXB7D6V8aODmdBgN/Q4rVlceSP9XPOl+bWpXxhmMmTGrZCbCAHlaTwLZIP+t /jiMO/mZoZ5rkN0bNfnvTXlP0LfNq542fwq8XHhqAp8Vg7is8BaCrbqL09E41bC5DdCfPmmV0j4 B/cBTlqFIGhKW8ei9MnXu1edEn9GWAT7E7eIYiFVbyCFpiXdQ9f6JO/sEiPf5s+D2kwf+3qSqBD UDUo4OfBLW3ZmYrj9Mti9nlbQXxWAmaqQq5PDIb6e2xS02DasO1Ajpx9MTXByX2yG9WchDzEEV6 2giNUjMkQD1j3A6s75MekA0VpN/YsVq7Lm5EL0wqZyu6vKSEnYyhhUpQybJud2NGGkNEmAV5Use GWgZ+Pw6KBN+k= X-Google-Smtp-Source: AGHT+IHJpcEdw1607F+Ey1V4LbwjmDQawpeGTA8lma3MVtT0pEJj48H/kPwEqm38rL5rx3ziZa4wPw== X-Received: by 2002:a05:600c:3487:b0:471:115e:9605 with SMTP id 5b1f17b1804b1-4775ce3d8a1mr28339055e9.35.1762340997771; Wed, 05 Nov 2025 03:09:57 -0800 (PST) Received: from localhost.localdomain ([46.10.223.24]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477558c42adsm39728415e9.4.2025.11.05.03.09.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Nov 2025 03:09:57 -0800 (PST) From: "Nikola Z. Ivanov" To: jaegeuk@kernel.org, chao@kernel.org, linux-f2fs-devel@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org, skhan@linuxfoundation.org, david.hunter.linux@gmail.com, linux-kernel-mentees@lists.linuxfoundation.org, khalid@kernel.org, stable@kernel.org, "Nikola Z. Ivanov" Subject: [PATCH v4 1/2] f2fs: Rename f2fs_unlink exit label Date: Wed, 5 Nov 2025 13:09:42 +0200 Message-ID: X-Mailer: git-send-email 2.51.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename "fail" label to "out" as it's used as a default exit path out of f2fs_unlink as well as error path. Signed-off-by: Nikola Z. Ivanov Reviewed-by: Chao Yu --- fs/f2fs/namei.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c index b882771e4699..40cf80fd9d9a 100644 --- a/fs/f2fs/namei.c +++ b/fs/f2fs/namei.c @@ -552,21 +552,21 @@ static int f2fs_unlink(struct inode *dir, struct dent= ry *dentry) =20 if (unlikely(f2fs_cp_error(sbi))) { err =3D -EIO; - goto fail; + goto out; } =20 err =3D f2fs_dquot_initialize(dir); if (err) - goto fail; + goto out; err =3D f2fs_dquot_initialize(inode); if (err) - goto fail; + goto out; =20 de =3D f2fs_find_entry(dir, &dentry->d_name, &folio); if (!de) { if (IS_ERR(folio)) err =3D PTR_ERR(folio); - goto fail; + goto out; } =20 if (unlikely(inode->i_nlink =3D=3D 0)) { @@ -575,7 +575,7 @@ static int f2fs_unlink(struct inode *dir, struct dentry= *dentry) err =3D -EFSCORRUPTED; set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_FSCK); f2fs_folio_put(folio, false); - goto fail; + goto out; } =20 f2fs_balance_fs(sbi, true); @@ -585,7 +585,7 @@ static int f2fs_unlink(struct inode *dir, struct dentry= *dentry) if (err) { f2fs_unlock_op(sbi); f2fs_folio_put(folio, false); - goto fail; + goto out; } f2fs_delete_entry(de, folio, dir, inode); f2fs_unlock_op(sbi); @@ -601,7 +601,7 @@ static int f2fs_unlink(struct inode *dir, struct dentry= *dentry) =20 if (IS_DIRSYNC(dir)) f2fs_sync_fs(sbi->sb, 1); -fail: +out: trace_f2fs_unlink_exit(inode, err); return err; } --=20 2.51.0 From nobody Fri Dec 19 12:44:57 2025 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 08E6330FC35 for ; Wed, 5 Nov 2025 11:10:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762341003; cv=none; b=eUqT8JBAtCD4HZhgPnoWOinooPARE8mPfmE/lSer11H5P581w/n3uFaQA8jo9yCB8sv2fj64NZI5fMKyB729+uRV//e/b4vPH8AEAgAuLNKOe5KkQgh5IFskbXa9JYJ62oz2g02q+WVME/vq8hqr+8B2ApWfcOpHGOuDaSvNdRQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762341003; c=relaxed/simple; bh=hstc0vY91gKGBMtCAdJ8eBxi8EGOtO55dsqiQicv5j4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=opyrZY5sudq44oLcStXNRxqvSeznWc+kdq6LA9xWYwtWh4boJ6IusX8xeH/+Q7AwHhdWJ7nXRHllhiqLYQ4cxzyiF8DjZai4hPPtOxGZY4fLq5RW1gn6svItvfBpF0219aP9AXqMT6IBXmTcZPV9RUKcnCdmMjf/JIiGFlhzpJU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=OCfcqG/d; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="OCfcqG/d" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-477549b3082so15451175e9.0 for ; Wed, 05 Nov 2025 03:10:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762341000; x=1762945800; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dSJdhsMEI+4YuimZ1hmkS4JUtetSOHWFOs9qPgUuN/8=; b=OCfcqG/dyw6a4BwCZi3A7751m9GT+KJpq8Ci0tE1nORIPO8wW6UCJxTdZnjIo4KnU4 z44Je3zA5DWDmz8x0ivg8iIHRPcFjfhUosrcgasJ8TMMgtt2AIrLd8ucrtbjhvQKTHdN ua1bc7WJGzKLX1b3va4AgE437g5d9yd9Z+JFdW4jZv5itXYHKW36Xec8pbz50Ek1Q9QG KT4zXubWHvWcZY/Yw2JvKvEN0iaWTvRffEMwytW8xaUxnO+UfAz2juOG7PJLwuvTU54k 1W01yHyXslrsXjO0YylOtf7LX+H95kNswvCeDrsiuMP1QYQIgQSx0FdBLDqHazGzswVP KmQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762341000; x=1762945800; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dSJdhsMEI+4YuimZ1hmkS4JUtetSOHWFOs9qPgUuN/8=; b=bEEgpTZPYkAjcuDz1ZARxsuahOPF5D4njzV/ELIwQaYwIdvw614tXn03aX3oxPz+99 PrOOzn0FKWDkYwb8YAlcrByN/h5hzIy5FNlBsJXc5oqFe4UI76eUJLBGgGRw2BkAPKAs pPWJFiSqTecrfEQdVhld6KPC4tgE11ZzSTXnEwduvLyCtRgh12/UaM/ie3en6wdQvpBl Mh5JjyhmhDoRUFYBFNkHyAQsSjuSuWS011V0hq2jaFAviiNmZp8ThndlLcH0dzXmTe/h G8u/HSAQJondmlMDTQFgqMd5/dz8SeIcuhbcq7qCTH5BL2oAfaqYNaHHXb5gYANDed/Y rxxQ== X-Gm-Message-State: AOJu0YyRs1uZ9P2GXFEjhy+iYnv/uvz3B5IqzZRvVHRP4n4kdZiiDp7t ga2PR77AlvXzfptTt7gpR2YMU8CCOCQq/EvN1Zqs7ps3fZ9yKqiF0404 X-Gm-Gg: ASbGncvY0sAw1PPNmif+JegNangQ2cnPxt8XrgrxCaKwI/iInSB42xjsu5ZQODCMfLX lItWFWAlrDGP1MTgsQAXclugmuiLUAAV4vsPNPcmxLtI2VFkl5ZI+TzDsxb/5d3uPFtqx5Y2sON LY7KSAnF4L3XBQ6qVOVtJC1LJ4y3vTbOJ9YS7laO1mcXVMhi+BfnsRqnDYuvgrf/v4Dql2NNMl2 ma2Vvi7aZRYbHFPpZLaBYTqO19dk92bvy8M+Z73DwcbQBCCW85nAqUHGLEVBB8UVwbQJaRFABiQ C6O7zbnlH+oFHl6YGrZ2r3RiVmVbimvHrgkKvIG7ugLYYZevLDkcuom4//lUM5f/uOp4TzVCMRM GasloLvhdiY2RYnVETOZdFJ23Z7qjtAm52ZwfwFdOcFiqRjp801tucj26W9wBlWDGuuJDyNESdA fjVsqn+ClaIik= X-Google-Smtp-Source: AGHT+IFgNrtalxzChmeyomCPGlCrqR2rqh01/vklcS8njZxeR/kapLNbNRzhAZqZQMVsHdryQdmTfA== X-Received: by 2002:a05:600c:4583:b0:475:dde5:d91b with SMTP id 5b1f17b1804b1-4775cdc8ea6mr25282445e9.17.1762340999987; Wed, 05 Nov 2025 03:09:59 -0800 (PST) Received: from localhost.localdomain ([46.10.223.24]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477558c42adsm39728415e9.4.2025.11.05.03.09.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Nov 2025 03:09:58 -0800 (PST) From: "Nikola Z. Ivanov" To: jaegeuk@kernel.org, chao@kernel.org, linux-f2fs-devel@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org, skhan@linuxfoundation.org, david.hunter.linux@gmail.com, linux-kernel-mentees@lists.linuxfoundation.org, khalid@kernel.org, stable@kernel.org, "Nikola Z. Ivanov" , syzbot+c07d47c7bc68f47b9083@syzkaller.appspotmail.com Subject: [PATCH v4 2/2] f2fs: Add sanity checks before unlinking and loading inodes Date: Wed, 5 Nov 2025 13:09:43 +0200 Message-ID: X-Mailer: git-send-email 2.51.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add check for inode->i_nlink =3D=3D 1 for directories during unlink, as their value is decremented twice, which can trigger a warning in drop_nlink. In such case mark the filesystem as corrupted and return from the function call with the relevant failure return value. Additionally add the check for i_nlink =3D=3D 1 in sanity_check_inode in order to detect on-disk corruption early. Reported-by: syzbot+c07d47c7bc68f47b9083@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=3Dc07d47c7bc68f47b9083 Tested-by: syzbot+c07d47c7bc68f47b9083@syzkaller.appspotmail.com Signed-off-by: Nikola Z. Ivanov Reviewed-by: Chao Yu --- fs/f2fs/inode.c | 6 ++++++ fs/f2fs/namei.c | 17 ++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c index 8c4eafe9ffac..e2405b79b3cc 100644 --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c @@ -294,6 +294,12 @@ static bool sanity_check_inode(struct inode *inode, st= ruct folio *node_folio) return false; } =20 + if (S_ISDIR(inode->i_mode) && unlikely(inode->i_nlink =3D=3D 1)) { + f2fs_warn(sbi, "%s: directory inode (ino=3D%lx) has a single i_nlink", + __func__, inode->i_ino); + return false; + } + if (f2fs_has_extra_attr(inode)) { if (!f2fs_sb_has_extra_attr(sbi)) { f2fs_warn(sbi, "%s: inode (ino=3D%lx) is with extra_attr, but extra_att= r feature is off", diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c index 40cf80fd9d9a..849cfdc57b30 100644 --- a/fs/f2fs/namei.c +++ b/fs/f2fs/namei.c @@ -570,12 +570,13 @@ static int f2fs_unlink(struct inode *dir, struct dent= ry *dentry) } =20 if (unlikely(inode->i_nlink =3D=3D 0)) { - f2fs_warn(F2FS_I_SB(inode), "%s: inode (ino=3D%lx) has zero i_nlink", + f2fs_warn(sbi, "%s: inode (ino=3D%lx) has zero i_nlink", __func__, inode->i_ino); - err =3D -EFSCORRUPTED; - set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_FSCK); - f2fs_folio_put(folio, false); - goto out; + goto corrupted; + } else if (S_ISDIR(inode->i_mode) && unlikely(inode->i_nlink =3D=3D 1)) { + f2fs_warn(sbi, "%s: directory inode (ino=3D%lx) has a single i_nlink", + __func__, inode->i_ino); + goto corrupted; } =20 f2fs_balance_fs(sbi, true); @@ -601,6 +602,12 @@ static int f2fs_unlink(struct inode *dir, struct dentr= y *dentry) =20 if (IS_DIRSYNC(dir)) f2fs_sync_fs(sbi->sb, 1); + + goto out; +corrupted: + err =3D -EFSCORRUPTED; + set_sbi_flag(sbi, SBI_NEED_FSCK); + f2fs_folio_put(folio, false); out: trace_f2fs_unlink_exit(inode, err); return err; --=20 2.51.0