4.14-stable patches

added patches:
	jfs-fix-gpf-in-difree.patch
	smackfs-restrict-bytes-count-in-smk_set_cipso.patch

diff --git a/queue-4.14/jfs-fix-gpf-in-difree.patch b/queue-4.14/jfs-fix-gpf-in-difree.patch
new file mode 100644 (file)
index 0000000..eb7d0d7
--- /dev/null
+++ b/queue-4.14/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
+@@ -161,7 +161,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.14/series b/queue-4.14/series
index 6308eef27b67f68abb5551d33db110ee6766dcf6..561ff6ba4ec14a1803fe5a31800c3b94e114cb92 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -228,3 +228,5 @@ 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
+smackfs-restrict-bytes-count-in-smk_set_cipso.patch

diff --git a/queue-4.14/smackfs-restrict-bytes-count-in-smk_set_cipso.patch b/queue-4.14/smackfs-restrict-bytes-count-in-smk_set_cipso.patch
new file mode 100644 (file)
index 0000000..cb0bcf3
--- /dev/null
+++ b/queue-4.14/smackfs-restrict-bytes-count-in-smk_set_cipso.patch
@@ -0,0 +1,39 @@
+From 49ec114a6e62d8d320037ce71c1aaf9650b3cafd Mon Sep 17 00:00:00 2001
+From: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
+Date: Mon, 12 Apr 2021 22:45:50 +0900
+Subject: smackfs: restrict bytes count in smk_set_cipso()
+
+From: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
+
+commit 49ec114a6e62d8d320037ce71c1aaf9650b3cafd upstream.
+
+Oops, I failed to update subject line.
+
+From 07571157c91b98ce1a4aa70967531e64b78e8346 Mon Sep 17 00:00:00 2001
+From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
+Date: Mon, 12 Apr 2021 22:25:06 +0900
+Subject: smackfs: restrict bytes count in smk_set_cipso()
+
+Commit 7ef4c19d245f3dc2 ("smackfs: restrict bytes count in smackfs write
+functions") missed that count > SMK_CIPSOMAX check applies to only
+format == SMK_FIXED24_FMT case.
+
+Reported-by: syzbot <syzbot+77c53db50c9fff774e8e@syzkaller.appspotmail.com>
+Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
+Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ security/smack/smackfs.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/security/smack/smackfs.c
++++ b/security/smack/smackfs.c
+@@ -883,6 +883,8 @@ static ssize_t smk_set_cipso(struct file
+       if (format == SMK_FIXED24_FMT &&
+           (count < SMK_CIPSOMIN || count > SMK_CIPSOMAX))
+               return -EINVAL;
++      if (count > PAGE_SIZE)
++              return -EINVAL;
+ 
+       data = memdup_user_nul(buf, count);
+       if (IS_ERR(data))