Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 07:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] fix SG_IO bio leak

Browse Source 
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 committed by Jens Axboe
parent 2b02a17920
commit 77d172ce27
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
block/scsi_ioctl.c
View File

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