* [PATCH v4] virtio_blk: Fix an SG_IO regression
@ 2017-10-26 10:10 Bart Van Assche
2017-10-27 6:39 ` Christoph Hellwig
0 siblings, 1 reply; 4+ messages in thread
From: Bart Van Assche @ 2017-10-26 10:10 UTC (permalink / raw)
To: Jens Axboe
Cc: linux-block, Christoph Hellwig, Bart Van Assche,
Michael S . Tsirkin, Dann Frazier, stable
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 ca18d6f769d2 ("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
---
drivers/block/virtio_blk.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 34e17ee799be..e477d4a5181e 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -593,10 +593,20 @@ static int virtblk_map_queues(struct blk_mq_tag_set *set)
return blk_mq_virtio_map_queues(set, vblk->vdev, 0);
}
+static void virtblk_initialize_rq(struct request *req)
+{
+ struct virtblk_req *vbr = blk_mq_rq_to_pdu(req);
+
+#ifdef CONFIG_VIRTIO_BLK_SCSI
+ scsi_req_init(&vbr->sreq);
+#endif
+}
+
static const struct blk_mq_ops virtio_mq_ops = {
.queue_rq = virtio_queue_rq,
.complete = virtblk_request_done,
.init_request = virtblk_init_request,
+ .initialize_rq_fn = virtblk_initialize_rq,
.map_queues = virtblk_map_queues,
};
--
2.14.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v4] virtio_blk: Fix an SG_IO regression
2017-10-26 10:10 [PATCH v4] virtio_blk: Fix an SG_IO regression Bart Van Assche
@ 2017-10-27 6:39 ` Christoph Hellwig
2017-10-27 14:24 ` Jens Axboe
0 siblings, 1 reply; 4+ messages in thread
From: Christoph Hellwig @ 2017-10-27 6:39 UTC (permalink / raw)
To: Bart Van Assche
Cc: Jens Axboe, linux-block, Christoph Hellwig, Michael S . Tsirkin,
Dann Frazier, stable
On Thu, Oct 26, 2017 at 12:10:15PM +0200, Bart Van Assche wrote:
> 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 ca18d6f769d2 ("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
> ---
> drivers/block/virtio_blk.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
> index 34e17ee799be..e477d4a5181e 100644
> --- a/drivers/block/virtio_blk.c
> +++ b/drivers/block/virtio_blk.c
> @@ -593,10 +593,20 @@ static int virtblk_map_queues(struct blk_mq_tag_set *set)
> return blk_mq_virtio_map_queues(set, vblk->vdev, 0);
> }
>
> +static void virtblk_initialize_rq(struct request *req)
> +{
> + struct virtblk_req *vbr = blk_mq_rq_to_pdu(req);
> +
> +#ifdef CONFIG_VIRTIO_BLK_SCSI
> + scsi_req_init(&vbr->sreq);
> +#endif
How about only defininig the initialize_rq method and implementation
if CONFIG_VIRTIO_BLK_SCSI is set?
Else looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v4] virtio_blk: Fix an SG_IO regression
2017-10-27 6:39 ` Christoph Hellwig
@ 2017-10-27 14:24 ` Jens Axboe
2017-10-28 17:06 ` Bart Van Assche
0 siblings, 1 reply; 4+ messages in thread
From: Jens Axboe @ 2017-10-27 14:24 UTC (permalink / raw)
To: Christoph Hellwig, Bart Van Assche
Cc: linux-block, Michael S . Tsirkin, Dann Frazier, stable
On 10/27/2017 12:39 AM, Christoph Hellwig wrote:
> On Thu, Oct 26, 2017 at 12:10:15PM +0200, Bart Van Assche wrote:
>> 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 ca18d6f769d2 ("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
>> ---
>> drivers/block/virtio_blk.c | 10 ++++++++++
>> 1 file changed, 10 insertions(+)
>>
>> diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
>> index 34e17ee799be..e477d4a5181e 100644
>> --- a/drivers/block/virtio_blk.c
>> +++ b/drivers/block/virtio_blk.c
>> @@ -593,10 +593,20 @@ static int virtblk_map_queues(struct blk_mq_tag_set *set)
>> return blk_mq_virtio_map_queues(set, vblk->vdev, 0);
>> }
>>
>> +static void virtblk_initialize_rq(struct request *req)
>> +{
>> + struct virtblk_req *vbr = blk_mq_rq_to_pdu(req);
>> +
>> +#ifdef CONFIG_VIRTIO_BLK_SCSI
>> + scsi_req_init(&vbr->sreq);
>> +#endif
>
> How about only defininig the initialize_rq method and implementation
> if CONFIG_VIRTIO_BLK_SCSI is set?
>
> Else looks good:
>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
I did that while merging it.
--
Jens Axboe
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-10-28 17:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-26 10:10 [PATCH v4] virtio_blk: Fix an SG_IO regression Bart Van Assche
2017-10-27 6:39 ` Christoph Hellwig
2017-10-27 14:24 ` Jens Axboe
2017-10-28 17:06 ` Bart Van Assche
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).