Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77d172ce authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Jens Axboe
Browse files

[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: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 2b02a179

block/scsi_ioctl.c

+3 −0
Original line number Diff line number Diff line
@@ -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;