From 4b02eb164221c079b428566499343af2766c2ec3 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Fri, 15 Aug 2025 09:25:58 -0700 Subject: [PATCH] libext2fs: relock CACHE_MTX after calling ->write_error In the UNIX I/O manager, we drop CACHE_MTX before calling the ->write_error handler in case it decides to retry the failed write. Therefore, we must retake the lock after it returns, to ensure consistent lock state when flush_cached_blocks returns. Cc: # v1.46.6 Fixes: 0e0c7537eb5fdc ("libext2fs: unix_io: fix_potential error path deadlock in flush_cached_blocks()") Signed-off-by: "Darrick J. Wong" --- lib/ext2fs/unix_io.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c index 1af246da..cb408f51 100644 --- a/lib/ext2fs/unix_io.c +++ b/lib/ext2fs/unix_io.c @@ -734,6 +734,7 @@ retry: retval2); if (err_buf) ext2fs_free_mem(&err_buf); + mutex_lock(data, CACHE_MTX); goto retry; } else cache->write_err = 0; -- 2.47.2