]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 Dec 2016 07:41:17 +0000 (08:41 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 Dec 2016 07:41:17 +0000 (08:41 +0100)
added patches:
don-t-feed-anything-but-regular-iovec-s-to-blk_rq_map_user_iov.patch

queue-4.4/don-t-feed-anything-but-regular-iovec-s-to-blk_rq_map_user_iov.patch [new file with mode: 0644]
queue-4.4/series

diff --git a/queue-4.4/don-t-feed-anything-but-regular-iovec-s-to-blk_rq_map_user_iov.patch b/queue-4.4/don-t-feed-anything-but-regular-iovec-s-to-blk_rq_map_user_iov.patch
new file mode 100644 (file)
index 0000000..e075dbd
--- /dev/null
@@ -0,0 +1,34 @@
+From a0ac402cfcdc904f9772e1762b3fda112dcc56a0 Mon Sep 17 00:00:00 2001
+From: Linus Torvalds <torvalds@linux-foundation.org>
+Date: Tue, 6 Dec 2016 16:18:14 -0800
+Subject: Don't feed anything but regular iovec's to blk_rq_map_user_iov
+
+From: Linus Torvalds <torvalds@linux-foundation.org>
+
+commit a0ac402cfcdc904f9772e1762b3fda112dcc56a0 upstream.
+
+In theory we could map other things, but there's a reason that function
+is called "user_iov".  Using anything else (like splice can do) just
+confuses it.
+
+Reported-and-tested-by: Johannes Thumshirn <jthumshirn@suse.de>
+Cc: Al Viro <viro@ZenIV.linux.org.uk>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ block/blk-map.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/block/blk-map.c
++++ b/block/blk-map.c
+@@ -90,6 +90,9 @@ int blk_rq_map_user_iov(struct request_q
+       if (!iter || !iter->count)
+               return -EINVAL;
++      if (!iter_is_iovec((struct iov_iter *)iter))
++              return -EINVAL;
++
+       iov_for_each(iov, i, *iter) {
+               unsigned long uaddr = (unsigned long) iov.iov_base;
index 1227c51dfa6d6288bca5eccfbce5010660271a07..7284724d12908b6e72fe5a64e9154c6f182bf6c4 100644 (file)
@@ -20,3 +20,4 @@ net-ping-check-minimum-size-on-icmp-header-length.patch
 sparc32-fix-inverted-invalid_frame_pointer-checks-on-sigreturns.patch
 sparc64-fix-find_node-warning-if-numa-node-cannot-be-found.patch
 sparc64-fix-compile-warning-section-mismatch-in-find_node.patch
+don-t-feed-anything-but-regular-iovec-s-to-blk_rq_map_user_iov.patch