Skip to content

Commit efea2ab

Browse files
KAGA-KOKOaxboe
authored andcommitted
virtio_blk: Fix an SG_IO regression
Avoid that submitting an SG_IO ioctl triggers a kernel oops that is preceded by: usercopy: kernel memory overwrite attempt detected to (null) (<null>) (6 bytes) kernel BUG at mm/usercopy.c:72! Reported-by: Dann Frazier <dann.frazier@canonical.com> Fixes: commit ca18d6f ("block: Make most scsi_req_init() calls implicit") Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com> Cc: Michael S. Tsirkin <mst@redhat.com> Cc: Dann Frazier <dann.frazier@canonical.com> Cc: <stable@vger.kernel.org> # v4.13 Reviewed-by: Christoph Hellwig <hch@lst.de> Moved virtblk_initialize_rq() inside CONFIG_VIRTIO_BLK_SCSI. Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 93689a6 commit efea2ab

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

drivers/block/virtio_blk.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,10 +593,22 @@ static int virtblk_map_queues(struct blk_mq_tag_set *set)
593593
return blk_mq_virtio_map_queues(set, vblk->vdev, 0);
594594
}
595595

596+
#ifdef CONFIG_VIRTIO_BLK_SCSI
597+
static void virtblk_initialize_rq(struct request *req)
598+
{
599+
struct virtblk_req *vbr = blk_mq_rq_to_pdu(req);
600+
601+
scsi_req_init(&vbr->sreq);
602+
}
603+
#endif
604+
596605
static const struct blk_mq_ops virtio_mq_ops = {
597606
.queue_rq = virtio_queue_rq,
598607
.complete = virtblk_request_done,
599608
.init_request = virtblk_init_request,
609+
#ifdef CONFIG_VIRTIO_BLK_SCSI
610+
.initialize_rq_fn = virtblk_initialize_rq,
611+
#endif
600612
.map_queues = virtblk_map_queues,
601613
};
602614

0 commit comments

Comments
 (0)