This patch fixes bio leaks in SG_IO. rq->bio can be changed after io
completion, so we need to reset rq->bio before calling blk_rq_unmap_user()

http://marc.theaimsgroup.com/?l=linux-kernel&m=116570666807983&w=2

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
FUJITA Tomonori 2006-12-11 10:01:34 +01:00 коммит произвёл Jens Axboe
Родитель 2b02a17920
Коммит 77d172ce27
1 изменённых файлов: 3 добавлений и 0 удалений

Просмотреть файл

@ -228,6 +228,7 @@ static int sg_io(struct file *file, request_queue_t *q,
struct request *rq;
char sense[SCSI_SENSE_BUFFERSIZE];
unsigned char cmd[BLK_MAX_CDB];
struct bio *bio;
if (hdr->interface_id != 'S')
return -EINVAL;
@ -308,6 +309,7 @@ static int sg_io(struct file *file, request_queue_t *q,
if (ret)
goto out;
bio = rq->bio;
rq->retries = 0;
start_time = jiffies;
@ -338,6 +340,7 @@ static int sg_io(struct file *file, request_queue_t *q,
hdr->sb_len_wr = len;
}
rq->bio = bio;
if (blk_rq_unmap_user(rq))
ret = -EFAULT;