From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 5 Dec 2018 06:59:57 +0000 (+0100)
Subject: 4.14-stable patches
X-Git-Tag: v4.19.7~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c4f5ebaf505337630fb92de74f64cc60e321982;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	f2fs-fix-missing-up_read.patch
---

diff --git a/queue-4.14/f2fs-fix-missing-up_read.patch b/queue-4.14/f2fs-fix-missing-up_read.patch
new file mode 100644
index 00000000000..02520fa2283
--- /dev/null
+++ b/queue-4.14/f2fs-fix-missing-up_read.patch
@@ -0,0 +1,35 @@
+From 89d13c38501df730cbb2e02c4499da1b5187119d Mon Sep 17 00:00:00 2001
+From: Jaegeuk Kim <jaegeuk@kernel.org>
+Date: Thu, 27 Sep 2018 22:15:31 -0700
+Subject: f2fs: fix missing up_read
+
+From: Jaegeuk Kim <jaegeuk@kernel.org>
+
+commit 89d13c38501df730cbb2e02c4499da1b5187119d upstream.
+
+This patch fixes missing up_read call.
+
+Fixes: c9b60788fc76 ("f2fs: fix to do sanity check with block address in main area")
+Cc: <stable@vger.kernel.org> # 4.19+
+Reviewed-by: Chao Yu <yuchao0@huawei.com>
+Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/f2fs/node.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/fs/f2fs/node.c
++++ b/fs/f2fs/node.c
+@@ -1399,8 +1399,10 @@ static int __write_node_page(struct page
+ 	}
+ 
+ 	if (__is_valid_data_blkaddr(ni.blk_addr) &&
+-		!f2fs_is_valid_blkaddr(sbi, ni.blk_addr, DATA_GENERIC))
++		!f2fs_is_valid_blkaddr(sbi, ni.blk_addr, DATA_GENERIC)) {
++		up_read(&sbi->node_write);
+ 		goto redirty_out;
++	}
+ 
+ 	if (atomic && !test_opt(sbi, NOBARRIER))
+ 		fio.op_flags |= REQ_PREFLUSH | REQ_FUA;
diff --git a/queue-4.14/series b/queue-4.14/series
index 1921576abb2..cac266ea18a 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -146,3 +146,4 @@ misc-mic-scif-fix-copy-paste-error-in-scif_create_remote_lookup.patch
 binder-fix-race-that-allows-malicious-free-of-live-buffer.patch
 libceph-weaken-sizeof-check-in-ceph_x_verify_authorizer_reply.patch
 libceph-check-authorizer-reply-challenge-length-before-reading.patch
+f2fs-fix-missing-up_read.patch