aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorLCPD Auto Merger2016-12-10 14:10:34 -0600
committerLCPD Auto Merger2016-12-10 14:10:34 -0600
commit2f9e72f4ae3818b7ec3e17bbe5d97149d446787f (patch)
tree007622d3c4906e840136cd60fb3656c5b11059d8 /block
parentf6e679d23ba9358228467c0592166007d7ae0fd6 (diff)
parentf45e386fbd8a8761d8a2aaf9de41f53ece41733b (diff)
downloadkernel-omap-2f9e72f4ae3818b7ec3e17bbe5d97149d446787f.tar.gz
kernel-omap-2f9e72f4ae3818b7ec3e17bbe5d97149d446787f.tar.xz
kernel-omap-2f9e72f4ae3818b7ec3e17bbe5d97149d446787f.zip
Merge branch 'ti-linux-4.4.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel into ti-lsk-android-linux-4.4.y
TI-Feature: ti_linux_base_android TI-Tree: git@git.ti.com:ti-linux-kernel/ti-linux-kernel.git TI-Branch: ti-linux-4.4.y * 'ti-linux-4.4.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel: (29 commits) Linux 4.4.38 esp6: Fix integrity verification when ESN are used esp4: Fix integrity verification when ESN are used ipv4: Set skb->protocol properly for local output ipv6: Set skb->protocol properly for local output Don't feed anything but regular iovec's to blk_rq_map_user_iov constify iov_iter_count() and iter_is_iovec() sparc64: fix compile warning section mismatch in find_node() sparc64: Fix find_node warning if numa node cannot be found sparc32: Fix inverted invalid_frame_pointer checks on sigreturns net: ping: check minimum size on ICMP header length net: avoid signed overflows for SO_{SND|RCV}BUFFORCE geneve: avoid use-after-free of skb->data sh_eth: remove unchecked interrupts for RZ/A1 net: bcmgenet: Utilize correct struct device for all DMA operations packet: fix race condition in packet_set_ring net/dccp: fix use-after-free in dccp_invalid_packet netlink: Do not schedule work from sk_destruct netlink: Call cb->done from a worker thread net/sched: pedit: make sure that offset is valid ... Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
Diffstat (limited to 'block')
-rw-r--r--block/blk-map.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/block/blk-map.c b/block/blk-map.c
index f565e11f465a..69953bd97e65 100644
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -90,6 +90,9 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
90 if (!iter || !iter->count) 90 if (!iter || !iter->count)
91 return -EINVAL; 91 return -EINVAL;
92 92
93 if (!iter_is_iovec(iter))
94 return -EINVAL;
95
93 iov_for_each(iov, i, *iter) { 96 iov_for_each(iov, i, *iter) {
94 unsigned long uaddr = (unsigned long) iov.iov_base; 97 unsigned long uaddr = (unsigned long) iov.iov_base;
95 98