redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

[PATCH] __blk_rq_unmap_user() fails to return error 

If the bio is user copied, the copy back could return -EFAULT. Make
sure we return any error seen during unmapping.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
wifi-calibration
Jens Axboe 2006-12-19 11:07:59 +01:00
parent 9c9381f942
commit 48785bb9fa
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
block/ll_rw_blk.c
View File

@ -2504,6 +2504,7 @@ EXPORT_SYMBOL(blk_rq_map_user_iov);
int blk_rq_unmap_user(struct request *rq) int blk_rq_unmap_user(struct request *rq)
{ {
struct bio *bio, *mapped_bio; struct bio *bio, *mapped_bio;
int ret = 0, ret2;
while ((bio = rq->bio)) { while ((bio = rq->bio)) {
if (bio_flagged(bio, BIO_BOUNCED)) if (bio_flagged(bio, BIO_BOUNCED))
@ -2511,11 +2512,15 @@ int blk_rq_unmap_user(struct request *rq)
else else
mapped_bio = bio; mapped_bio = bio;
__blk_rq_unmap_user(mapped_bio); ret2 = __blk_rq_unmap_user(mapped_bio);
if (ret2 && !ret)
ret = ret2;
rq->bio = bio->bi_next; rq->bio = bio->bi_next;
bio_put(bio); bio_put(bio);
} }
return 0;
return ret;
} }
EXPORT_SYMBOL(blk_rq_unmap_user); EXPORT_SYMBOL(blk_rq_unmap_user);