[packages/kernel/LINUX_4_1] - rel 2; fixes CVE-2017-14340: xfs: unprivileged user kernel oops

[arekm]

commit 108831b974726885cd0f98a4b8e815e21f0fb50e
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Sep 13 11:29:40 2017 +0200

    - rel 2; fixes CVE-2017-14340: xfs: unprivileged user kernel oops

 kernel-small_fixes.patch | 66 ++++++++++++++++++++++++++++++++++++++++++++++++
 kernel.spec              |  2 +-
 2 files changed, 67 insertions(+), 1 deletion(-)
---
diff --git a/kernel.spec b/kernel.spec
index 5f98a8cd..ede6cf2d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,7 +71,7 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		1
+%define		rel		2
 %define		basever		4.1
 %define		postver		.43
 
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 5607d7d0..e159da32 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -3520,3 +3520,69 @@ Acked-by: Joerg Roedel <jroedel at suse.de>
  					 X86_TRANSFER_NONE, NULL);
  }
 
+commit b31ff3cdf540110da4572e3e29bd172087af65cc
+Author: Richard Wareing <rwareing at fb.com>
+Date:   Wed Sep 13 09:09:35 2017 +1000
+
+    xfs: XFS_IS_REALTIME_INODE() should be false if no rt device present
+    
+    If using a kernel with CONFIG_XFS_RT=y and we set the RHINHERIT flag on
+    a directory in a filesystem that does not have a realtime device and
+    create a new file in that directory, it gets marked as a real time file.
+    When data is written and a fsync is issued, the filesystem attempts to
+    flush a non-existent rt device during the fsync process.
+    
+    This results in a crash dereferencing a null buftarg pointer in
+    xfs_blkdev_issue_flush():
+    
+      BUG: unable to handle kernel NULL pointer dereference at 0000000000000008
+      IP: xfs_blkdev_issue_flush+0xd/0x20
+      .....
+      Call Trace:
+        xfs_file_fsync+0x188/0x1c0
+        vfs_fsync_range+0x3b/0xa0
+        do_fsync+0x3d/0x70
+        SyS_fsync+0x10/0x20
+        do_syscall_64+0x4d/0xb0
+        entry_SYSCALL64_slow_path+0x25/0x25
+    
+    Setting RT inode flags does not require special privileges so any
+    unprivileged user can cause this oops to occur.  To reproduce, confirm
+    kernel is compiled with CONFIG_XFS_RT=y and run:
+    
+      # mkfs.xfs -f /dev/pmem0
+      # mount /dev/pmem0 /mnt/test
+      # mkdir /mnt/test/foo
+      # xfs_io -c 'chattr +t' /mnt/test/foo
+      # xfs_io -f -c 'pwrite 0 5m' -c fsync /mnt/test/foo/bar
+    
+    Or just run xfstests with MKFS_OPTIONS="-d rtinherit=1" and wait.
+    
+    Kernels built with CONFIG_XFS_RT=n are not exposed to this bug.
+    
+    Fixes: f538d4da8d52 ("[XFS] write barrier support")
+    Cc: <stable at vger.kernel.org>
+    Signed-off-by: Richard Wareing <rwareing at fb.com>
+    Signed-off-by: Dave Chinner <david at fromorbit.com>
+    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+
+diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
+index 9301c5a6060b..dcd1292664b3 100644
+--- a/fs/xfs/xfs_linux.h
++++ b/fs/xfs/xfs_linux.h
+@@ -270,7 +270,14 @@ static inline uint64_t howmany_64(uint64_t x, uint32_t y)
+ #endif /* DEBUG */
+ 
+ #ifdef CONFIG_XFS_RT
+-#define XFS_IS_REALTIME_INODE(ip) ((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME)
++
++/*
++ * make sure we ignore the inode flag if the filesystem doesn't have a
++ * configured realtime device.
++ */
++#define XFS_IS_REALTIME_INODE(ip)			\
++	(((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME) &&	\
++	 (ip)->i_mount->m_rtdev_targp)
+ #else
+ #define XFS_IS_REALTIME_INODE(ip) (0)
+ #endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/108831b974726885cd0f98a4b8e815e21f0fb50e