linux-ext4 - [PATCH] ext4: fix the deadlock in mpage_da_map_and

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <4E968F8E.5070802@sx.jp.nec.com>
Date:	Thu, 13 Oct 2011 16:13:18 +0900
From:	Kazuya Mio <k-mio@...jp.nec.com>
To:	ext4 <linux-ext4@...r.kernel.org>
CC:	Theodore Tso <tytso@....edu>, Andreas Dilger <adilger@...ger.ca>
Subject: [PATCH] ext4: fix the deadlock in mpage_da_map_and_submit()

If ext4_jbd2_file_inode() in mpage_da_map_and_submit() fails due to journal
abort, this function returns to caller without unlocking the page.
It leads to the deadlock, and the patch fixes this issue by calling
mpage_da_submit_io().

Signed-off-by: Kazuya Mio <k-mio@...jp.nec.com>
---
 fs/ext4/inode.c |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 986e238..cd3ccc0 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1475,9 +1475,11 @@ static void mpage_da_map_and_submit(struct mpage_da_data *mpd)
 
 	if (ext4_should_order_data(mpd->inode)) {
 		err = ext4_jbd2_file_inode(handle, mpd->inode);
-		if (err)
+		if (err) {
 			/* This only happens if the journal is aborted */
-			return;
+			mpd->retval = err;
+			goto submit_io;
+		}
 	}
 
 	/*
@@ -2174,11 +2176,12 @@ retry:
 			ret = 0;
 		} else if (ret == MPAGE_DA_EXTENT_TAIL) {
 			/*
-			 * got one extent now try with
-			 * rest of the pages
+			 * Got one extent now try with rest of the pages.
+			 * If mpd.retval is set -EIO, journal is aborted.
+			 * So we don't need to write any more.
 			 */
 			pages_written += mpd.pages_written;
-			ret = 0;
+			ret = mpd.retval;
 			io_done = 1;
 		} else if (wbc->nr_to_write)
 			/*
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html