diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-07 01:18:14 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-07 17:23:35 +0100 |
| commit | a0ac402cfcdc904f9772e1762b3fda112dcc56a0 (patch) | |
| tree | 6d4a89d91174c334881d9224bfcf9752ae75c8d3 /block/blk-map.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
| download | linux-a0ac402cfcdc904f9772e1762b3fda112dcc56a0.tar.xz linux-a0ac402cfcdc904f9772e1762b3fda112dcc56a0.zip | |
Don't feed anything but regular iovec's to blk_rq_map_user_iov
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>
Diffstat (limited to '')
| -rw-r--r-- | block/blk-map.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/block/blk-map.c b/block/blk-map.c index b8657fa8dc9a..27fd8d92892d 100644 --- a/block/blk-map.c +++ b/block/blk-map.c @@ -118,6 +118,9 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq, struct iov_iter i; int ret; + if (!iter_is_iovec(iter)) + goto fail; + if (map_data) copy = true; else if (iov_iter_alignment(iter) & align) @@ -140,6 +143,7 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq, unmap_rq: __blk_rq_unmap_user(bio); +fail: rq->bio = NULL; return -EINVAL; } |