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 91D3647A87A; Sat, 12 Sep 2026 12:32:42 +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=1789216363; cv=none; b=BUCwvrFTQnUJHMTR0/UA/9IbvfW7OE7LPHrm89/hdV6aEig02yetlVF0gWdejrqc4rG9mMs3TxoTJN3mGFNnyF1wRA4kagog7HyTZExf5fai1AlKskuUu5/eclGrUnGIE6017wNrhWrBkxHU0qgmH2OVcdHttMYAuLaRiHXDBdY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789216363; c=relaxed/simple; bh=K7tPekPbNyNPaMiS9j6P3+mb7PQJE6WMsS6lWgcXfTE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z2Uz1K6tSYBMzc4FLMQ/RTtFMvJ0YLSAesBt4snJ6gJaGKF40wOsn4oxwAvSEa8DaXIvslJNfyZeGCZ063fW8zqj2m+orT9uViE4WAZAyBY2yJ7MHimaYtV81ZgQ2HnU+O/G8tE+H3TgtpLpBBCHocrVenOwwV4O59/4TUXxlHg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cOkeC3AD; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="cOkeC3AD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6CE3F1F000FF; Sat, 12 Sep 2026 12:32:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789216362; bh=gGUYzOS6nnmSuYcwVmbrMKpMCFwMYxufohicwdOXdPI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cOkeC3ADu5z4Ya1/7PgKnT8AEyW4lqQmVa19iCsMksVvM/8XRY3ZD9YkGJXQMmPLE H45KSGmkjT6deGb3BST2G95itIhdqIbkjl7GB6/O6Otv8m3/N6nYtLmIXJ5oDTfN3B NBFPHE0YghdBHYI4GkTSB3Tck6dvkxinP0Z94nCc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+8baf9a79a3ffc6271cb6@syzkaller.appspotmail.com, Ryusuke Konishi , Viacheslav Dubeyko , Sasha Levin Subject: [PATCH 6.12 0721/1376] nilfs2: fix BUG in nilfs_copy_dirty_pages() on dirty state mismatch Date: Sat, 12 Sep 2026 08:52:27 +0200 Message-ID: <20260912065623.610191392@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065607.535295758@linuxfoundation.org> References: <20260912065607.535295758@linuxfoundation.org> User-Agent: quilt/0.69 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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ryusuke Konishi [ Upstream commit 66f4ad3ce158902e5f98afea93189972ed8750c2 ] Syzbot reported a kernel BUG triggered within nilfs_copy_dirty_pages(), which copies dirty DAT file folios/pages to its shadow page cache. The BUG occurs when a retrieved dirty folio/page unexpectedly loses its 'dirty' status. This issue arises because, since the commit referenced below, the 'dirty' flag of a folio/page can be cleared asynchronously after the filesystem detects metadata corruption and transitions to read-only mode. Resolve the issue by returning an -EROFS error if the filesystem has transitioned to read-only mode. Also change the behavior to issue a kernel warning only once instead of triggering a kernel BUG when this unexpected 'dirty' state is detected while the filesystem is not in read-only mode. Reported-by: syzbot+8baf9a79a3ffc6271cb6@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=8baf9a79a3ffc6271cb6 Fixes: 8c26c4e2694a ("nilfs2: fix issue with flush kernel thread after remount in RO mode because of driver's internal error or metadata corruption") Signed-off-by: Ryusuke Konishi Signed-off-by: Viacheslav Dubeyko Signed-off-by: Sasha Levin --- fs/nilfs2/page.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c index 06f18fe86407e..bc698bb66f790 100644 --- a/fs/nilfs2/page.c +++ b/fs/nilfs2/page.c @@ -244,6 +244,7 @@ static void nilfs_copy_folio(struct folio *dst, struct folio *src, int nilfs_copy_dirty_pages(struct address_space *dmap, struct address_space *smap) { + struct inode *smap_inode = smap->host; struct folio_batch fbatch; unsigned int i; pgoff_t index = 0; @@ -259,8 +260,19 @@ int nilfs_copy_dirty_pages(struct address_space *dmap, struct folio *folio = fbatch.folios[i], *dfolio; folio_lock(folio); - if (unlikely(!folio_test_dirty(folio))) - NILFS_FOLIO_BUG(folio, "inconsistent dirty state"); + if (unlikely(!folio_test_dirty(folio))) { + if (WARN_ONCE(!sb_rdonly(smap_inode->i_sb), + "inconsistent dirty state\n")) + goto unlock_folio; + + /* + * If the filesystem has been forced to read-only + * due to metadata corruption. + */ + folio_unlock(folio); + err = -EROFS; + break; + } dfolio = filemap_grab_folio(dmap, folio->index); if (IS_ERR(dfolio)) { @@ -278,6 +290,7 @@ int nilfs_copy_dirty_pages(struct address_space *dmap, folio_unlock(dfolio); folio_put(dfolio); +unlock_folio: folio_unlock(folio); } folio_batch_release(&fbatch); -- 2.53.0