diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-12-12 10:13:41 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-12-12 10:13:41 -0800 |
| commit | 8a2ec431d5987e1d93c13208da1dcd0e430114ae (patch) | |
| tree | f637129753cfb35421fce566fcbb42f98540a8d7 /block | |
| parent | 97b84c96505aa2b9c8772bbae68a4fa93da8c0f4 (diff) | |
| parent | c95b7f1fab0c76882764a5196119237c8ad436ee (diff) | |
Merge tag 'v4.4.38' into android-4.4.y
This is the 4.4.38 stable release
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-map.c | 3 |
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, if (!iter || !iter->count) return -EINVAL; + if (!iter_is_iovec(iter)) + return -EINVAL; + iov_for_each(iov, i, *iter) { unsigned long uaddr = (unsigned long) iov.iov_base; |