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

Commit 24bb8fb9 authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe
Browse files

block: use jiffies conversion functions in scsi_ioctl.c 



Use msecs_to_jiffies() and jiffies_to_msecs() in scsi_ioctl().
Sometimes callers use very large values for e.g. vendor specific media
clear command and calculation can overflow.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent c63a1190

block/scsi_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq, 
	rq->cmd_len = hdr->cmd_len;

	rq->cmd_type = REQ_TYPE_BLOCK_PC;



	rq->timeout = (hdr->timeout * HZ) / 1000;

	rq->timeout = msecs_to_jiffies(hdr->timeout);

	if (!rq->timeout)

		rq->timeout = q->sg_timeout;

	if (!rq->timeout)
@@ -366,7 +366,7 @@ static int sg_io(struct file *file, struct request_queue *q, 
	 */

	blk_execute_rq(q, bd_disk, rq, 0);



	hdr->duration = ((jiffies - start_time) * 1000) / HZ;

	hdr->duration = jiffies_to_msecs(jiffies - start_time);



	return blk_complete_sghdr_rq(rq, hdr, bio);

out: