From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 15 Jul 2021 18:15:53 +0000 (+0200)
Subject: 4.4-stable patches
X-Git-Tag: v5.4.133~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bce718fe07e091bc555abe244a6edb6b65f1bbd4;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	jfs-fix-gpf-in-difree.patch
---

diff --git a/queue-4.4/jfs-fix-gpf-in-difree.patch b/queue-4.4/jfs-fix-gpf-in-difree.patch
new file mode 100644
index 00000000000..d3e6652bbd5
--- /dev/null
+++ b/queue-4.4/jfs-fix-gpf-in-difree.patch
@@ -0,0 +1,46 @@
+From 9d574f985fe33efd6911f4d752de6f485a1ea732 Mon Sep 17 00:00:00 2001
+From: Pavel Skripkin <paskripkin@gmail.com>
+Date: Sun, 6 Jun 2021 17:24:05 +0300
+Subject: jfs: fix GPF in diFree
+
+From: Pavel Skripkin <paskripkin@gmail.com>
+
+commit 9d574f985fe33efd6911f4d752de6f485a1ea732 upstream.
+
+Avoid passing inode with
+JFS_SBI(inode->i_sb)->ipimap == NULL to
+diFree()[1]. GFP will appear:
+
+	struct inode *ipimap = JFS_SBI(ip->i_sb)->ipimap;
+	struct inomap *imap = JFS_IP(ipimap)->i_imap;
+
+JFS_IP() will return invalid pointer when ipimap == NULL
+
+Call Trace:
+ diFree+0x13d/0x2dc0 fs/jfs/jfs_imap.c:853 [1]
+ jfs_evict_inode+0x2c9/0x370 fs/jfs/inode.c:154
+ evict+0x2ed/0x750 fs/inode.c:578
+ iput_final fs/inode.c:1654 [inline]
+ iput.part.0+0x3fe/0x820 fs/inode.c:1680
+ iput+0x58/0x70 fs/inode.c:1670
+
+Reported-and-tested-by: syzbot+0a89a7b56db04c21a656@syzkaller.appspotmail.com
+Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
+Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/jfs/inode.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/fs/jfs/inode.c
++++ b/fs/jfs/inode.c
+@@ -160,7 +160,8 @@ void jfs_evict_inode(struct inode *inode
+ 			if (test_cflag(COMMIT_Freewmap, inode))
+ 				jfs_free_zero_link(inode);
+ 
+-			diFree(inode);
++			if (JFS_SBI(inode->i_sb)->ipimap)
++				diFree(inode);
+ 
+ 			/*
+ 			 * Free the inode from the quota allocation.
diff --git a/queue-4.4/series b/queue-4.4/series
index cb94a3b1187..328c4d0a60c 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -139,3 +139,4 @@ media-gspca-sq905-fix-control-request-direction.patch
 media-gspca-sunplus-fix-zero-length-control-requests.patch
 media-rtl28xxu-fix-zero-length-control-request.patch
 media-uvcvideo-fix-pixel-format-change-for-elgato-cam-link-4k.patch
+jfs-fix-gpf-in-difree.patch