From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794980511; b=sLYy1eaUczizLm0B3JRJmORYwVw/Dgz18sk0P1dstayQp0EtDYb5yPlfubVV6gUr3vvW tOXTQFrHTt8sZIi0J4K3i2cQN4xWQEZnUjan7JedbarhakZ3nwpo38S+HmXHkZ30GAMAH +vU26Lw07NX+vrjaV8YbWeCgEq9m3bt2f56JMB/8fQn7+biABBBXY2vTUvMbyMTUBtl9w AaoGd/CC9sYRtRK4cGNdJsexf6gVKymoKSlpGvb4Ha8g0bisgZMSPWGeAHxi1O3+kfaw1 SIByBL0igiaRdj5ulAaoC5HaRZ924sSBchU1kltI0anoHsLgtEDmP/HnpTsea0S0xmQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794980511; h=Received:DKIM-Signature:Date:To:From:Subject:Message-Id; bh=nrDBHQoQpQrBR93r6PQm/w5gK6g7OHyUc0BLaSuHLAA=; b=qkrn3LrO9zV6iF+Hb7MaqauGjE1eud2Ju4AIBd51yEd5w/bTtdXMkgTRYgYyA2UboCMA RMOxNUW1Qlzzph797zUg1hFZ15bVSZJHNKBazY9E4FhaYktKEGiH0LadMUM2N2fZZhzRI 1zEumYtvaTn1Z6Mj5fEyu4hrAxnwVQVsDWmtRfk55ACIDh3wJuWZVilxatPblZMnlUOLB xhRyf8t9DUgMNDZCpLjkK5sNmVoNFa/txlDGAKNoNA/tQjSpQrKx4J4hb73TuA4pNJ8a+ YbynrmdBHonijOcrTOB8q8sfdrdm4yG8kVyc+KOHbY20NIlfeVTUh13LzrNnE127z5A== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linux-foundation.org header.i=@linux-foundation.org header.a=rsa-sha256 header.s=korg header.b=FxE5MRDC; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A6A4E606A325; Wed, 18 Nov 2026 05:41:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.a=rsa-sha256 header.s=korg header.b=FxE5MRDC Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7077F1F000C4; Wed, 18 Nov 2026 05:41:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=korg; t=1794980511; bh=nrDBHQoQpQrBR93r6PQm/w5gK6g7OHyUc0BLaSuHLAA=; h=Date:To:From:Subject; b=FxE5MRDCuMaSelfuWL0bGvG5jKn4AeZlDeyUem1rONUe169lVxOYBs6e9iJGcSID3 ntJCVI6+TkYBsaWU/41VGKzNJPAiH6j1aV2IciwGzlOHIhLbGFEBvh6t+dPX6B3g0S l4+psMRgYiDWur1s7Yv4mFfUUkqUs1Tbck3SePmo= Date: Tue, 17 Nov 2026 21:41:51 -0800 To: mm-commits@vger.kernel.org,vicky.yangwenfang@huawei.com, syzbot+42984127d45ad96219de@syzkaller.appspotmail.com,stable@vger.kernel.org, mark@fasheh.com,joseph.qi@linux.alibaba.com,jlbec@evilplan.org, heming.zhao@suse.com,zhiyuanzhang912@gmail.com,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-nonmm-hotfixes-stable] ocfs2-fix-kernel-bug-in-ocfs2_page_mkwrite-when-write_end-fails.patch removed from -mm tree Message-Id: <20261118054151.7077F1F000C4@smtp.kernel.org> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list The quilt patch titled Subject: ocfs2: fix kernel BUG in ocfs2_page_mkwrite() when write_end fails has been removed from the -mm tree. Its filename was ocfs2-fix-kernel-bug-in-ocfs2_page_mkwrite-when-write_end-fails.patch This patch was dropped because it was merged into the mm-nonmm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Zhiyuan Zhang Subject: ocfs2: fix kernel BUG in ocfs2_page_mkwrite() when write_end fails Date: Wed, 11 Nov 2026 02:34:44 +0000 syzbot reported a kernel BUG in the ocfs2 write fault path: (syz.0.17,5578,0):ocfs2_write_end_nolock:1945 ERROR: status = -30 kernel BUG at fs/ocfs2/mmap.c:106! Call Trace: do_page_mkwrite+0x147/0x310 mm/memory.c:3879 do_shared_fault mm/memory.c:6145 [inline] handle_mm_fault+0x1a53/0x3750 mm/memory.c:6943 __ocfs2_page_mkwrite() calls ocfs2_write_begin_nolock() and then ocfs2_write_end_nolock(), and uses BUG_ON() to assert that the latter returns the full length. But ocfs2_write_end_nolock() can fail: since commit 7f27ec978b0e ("ocfs2: call ocfs2_journal_access_di() before ocfs2_journal_dirty() in ocfs2_write_end_nolock()") it gets journal access to the inode buffer again, because the handle may have been restarted since ocfs2_write_begin_nolock(). That fails with -EROFS or -EIO once the journal has been aborted or jbd2 has seen write errors on the device. The syzbot reproducer gets there by shrinking the backing loop device to zero with LOOP_SET_STATUS while writing to a shared file mapping. Handle the failure instead of crashing. ocfs2_write_end_nolock() leaves the mmap folio locked, because ocfs2_unlock_folios() skips it when w_target_locked is set so that it can be returned with VM_FAULT_LOCKED, and do_page_mkwrite() does not unlock it either when ->page_mkwrite() returns an error. So unlock it and fail the fault; the faulting task gets SIGBUS, like for the other errors in this function. For an mmap write ocfs2_write_end_nolock() returns either len or a negative errno: inline data has already been converted to extents by ocfs2_write_begin_nolock(), and copied is equal to len. The BUG matters for local mounts, where the filesystem is expected to go read-only and keep running after a journal abort. On clustered mounts ocfs2_abort() panics the node anyway as soon as it notices the aborted journal. Link: https://lore.kernel.org/20261111023444.22688-1-zhiyuanzhang912@gmail.com Fixes: 7f27ec978b0e ("ocfs2: call ocfs2_journal_access_di() before ocfs2_journal_dirty() in ocfs2_write_end_nolock()") Signed-off-by: Zhiyuan Zhang Signed-off-by: Andrew Morton Reported-by: Closes: https://syzkaller.appspot.com/bug?extid=42984127d45ad96219de Reviewed-by: Joseph Qi Reviewed-by: Heming Zhao Cc: Mark Fasheh Cc: Joel Becker Cc: yangwenfang Cc: fs/ocfs2/mmap.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) --- a/fs/ocfs2/mmap.c~ocfs2-fix-kernel-bug-in-ocfs2_page_mkwrite-when-write_end-fails +++ a/fs/ocfs2/mmap.c @@ -103,7 +103,17 @@ static vm_fault_t __ocfs2_page_mkwrite(s goto out; } err = ocfs2_write_end_nolock(mapping, pos, len, len, fsdata); - BUG_ON(err != len); + if (err != len) { + /* + * ocfs2_write_end_nolock() keeps the mmap folio locked so + * that it can be returned to the VM with VM_FAULT_LOCKED. + * On failure nobody else will unlock it, so do it here. + */ + folio_unlock(locked_folio); + mlog_errno(err); + ret = vmf_error(err); + goto out; + } ret = VM_FAULT_LOCKED; out: return ret; _ Patches currently in -mm which might be from zhiyuanzhang912@gmail.com are