diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-12-12 22:17:37 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-12-12 22:17:37 +0800 |
| commit | 2f0de5192ae332ff270b2fc30594e4d67002d59b (patch) | |
| tree | 475fcbdaf94fdc1bc32c1527d448f702d5c18770 /block | |
| parent | bdcf7d8df4cfa7f99423da161019b964f7ce2520 (diff) | |
| parent | a057484ab40ff81f22a94bb62c035c78b5abd940 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlsk-v4.4-16.12-android
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; |