4.4-stable patches

added patches:
	ubifs-fix-deadlock-in-concurrent-bulk-read-and-writepage.patch

diff --git a/queue-4.4/series b/queue-4.4/series
index ae986414400d14a5039112e1c4c1fb903ebd11c8..05a0b1aef7c82cff1ba165ce397324a0573c7198 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -1 +1,2 @@
 alsa-usb-audio-apply-sample-rate-quirk-for-audioengine-d1.patch
+ubifs-fix-deadlock-in-concurrent-bulk-read-and-writepage.patch

diff --git a/queue-4.4/ubifs-fix-deadlock-in-concurrent-bulk-read-and-writepage.patch b/queue-4.4/ubifs-fix-deadlock-in-concurrent-bulk-read-and-writepage.patch
new file mode 100644 (file)
index 0000000..a5912ce
--- /dev/null
+++ b/queue-4.4/ubifs-fix-deadlock-in-concurrent-bulk-read-and-writepage.patch
@@ -0,0 +1,61 @@
+From f5de5b83303e61b1f3fb09bd77ce3ac2d7a475f2 Mon Sep 17 00:00:00 2001
+From: Zhihao Cheng <chengzhihao1@huawei.com>
+Date: Sat, 11 Jan 2020 17:50:36 +0800
+Subject: ubifs: Fix deadlock in concurrent bulk-read and writepage
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Zhihao Cheng <chengzhihao1@huawei.com>
+
+commit f5de5b83303e61b1f3fb09bd77ce3ac2d7a475f2 upstream.
+
+In ubifs, concurrent execution of writepage and bulk read on the same file
+may cause ABBA deadlock, for example (Reproduce method see Link):
+
+Process A(Bulk-read starts from page4)         Process B(write page4 back)
+  vfs_read                                       wb_workfn or fsync
+  ...                                            ...
+  generic_file_buffered_read                     write_cache_pages
+    ubifs_readpage                                 LOCK(page4)
+
+      ubifs_bulk_read                              ubifs_writepage
+        LOCK(ui->ui_mutex)                           ubifs_write_inode
+
+         ubifs_do_bulk_read                           LOCK(ui->ui_mutex)
+           find_or_create_page(alloc page4)                  ↑
+             LOCK(page4)                   <--     ABBA deadlock occurs!
+
+In order to ensure the serialization execution of bulk read, we can't
+remove the big lock 'ui->ui_mutex' in ubifs_bulk_read(). Instead, we
+allow ubifs_do_bulk_read() to lock page failed by replacing
+find_or_create_page(FGP_LOCK) with
+pagecache_get_page(FGP_LOCK | FGP_NOWAIT).
+
+Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
+Suggested-by: zhangyi (F) <yi.zhang@huawei.com>
+Cc: <Stable@vger.kernel.org>
+Fixes: 4793e7c5e1c ("UBIFS: add bulk-read facility")
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=206153
+Signed-off-by: Richard Weinberger <richard@nod.at>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+
+---
+ fs/ubifs/file.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/fs/ubifs/file.c
++++ b/fs/ubifs/file.c
+@@ -782,8 +782,9 @@ static int ubifs_do_bulk_read(struct ubi
+ 
+               if (page_offset > end_index)
+                       break;
+-              page = find_or_create_page(mapping, page_offset,
+-                                         GFP_NOFS | __GFP_COLD);
++              page = pagecache_get_page(mapping, page_offset,
++                               FGP_LOCK|FGP_ACCESSED|FGP_CREAT|FGP_NOWAIT,
++                               GFP_NOFS | __GFP_COLD);
+               if (!page)
+                       break;
+               if (!PageUptodate(page))