| author | Douglas Gilbert <dgilbert@interlog.com> | 2018-01-14 22:00:48 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-02-25 10:05:42 (GMT) |
| commit | 7abb5e9dd5683d693376635ff05ec729216fd726 (patch) | |
| tree | ddbfb2f4e6724cd35bf0d1bf939c9123374b2422 | |
| parent | 3ee287d35b25076b626898284d610465145aa43b (diff) | |
| download | common-7abb5e9dd5683d693376635ff05ec729216fd726.zip common-7abb5e9dd5683d693376635ff05ec729216fd726.tar.gz common-7abb5e9dd5683d693376635ff05ec729216fd726.tar.bz2 | |
blk_rq_map_user_iov: fix error override
commit 69e0927b3774563c19b5fb32e91d75edc147fb62 upstream.
During stress tests by syzkaller on the sg driver the block layer
infrequently returns EINVAL. Closer inspection shows the block
layer was trying to return ENOMEM (which is much more
understandable) but for some reason overroad that useful error.
Patch below does not show this (unchanged) line:
ret =__blk_rq_map_user_iov(rq, map_data, &i, gfp_mask, copy);
That 'ret' was being overridden when that function failed.
Signed-off-by: Douglas Gilbert <dgilbert@interlog.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | block/blk-map.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-map.c b/block/blk-map.c index 27fd8d92..a8b4f52 100644 --- a/block/blk-map.c +++ b/block/blk-map.c @@ -116,7 +116,7 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq, unsigned long align = q->dma_pad_mask | queue_dma_alignment(q); struct bio *bio = NULL; struct iov_iter i; - int ret; + int ret = -EINVAL; if (!iter_is_iovec(iter)) goto fail; @@ -145,7 +145,7 @@ unmap_rq: __blk_rq_unmap_user(bio); fail: rq->bio = NULL; - return -EINVAL; + return ret; } EXPORT_SYMBOL(blk_rq_map_user_iov); |