diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2006-12-11 10:01:34 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@nelson.home.kernel.dk> | 2006-12-12 10:22:23 +0100 |
| commit | 77d172ce2719b5ad2dc0637452c8871d9cba344c (patch) | |
| tree | 4783e29d9e1cff21a91e8c7a9d5e32c6c1b06479 /block | |
| parent | 2b02a1792000900ead4638f4d42fcdd742062cfa (diff) | |
| download | kernel-common-77d172ce2719b5ad2dc0637452c8871d9cba344c.tar.gz kernel-common-77d172ce2719b5ad2dc0637452c8871d9cba344c.tar.bz2 kernel-common-77d172ce2719b5ad2dc0637452c8871d9cba344c.zip | |
[PATCH] fix SG_IO bio leak
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>
Diffstat (limited to 'block')
| -rw-r--r-- | block/scsi_ioctl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index b3e210723a71..045cabd3d4b4 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c @@ -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; |