[PATCH][SRU Artful] virtio_blk: Fix an SG_IO regression

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH][SRU Artful] virtio_blk: Fix an SG_IO regression

dann frazier-4
From: Bart Van Assche <[hidden email]>

BugLink: https://bugs.launchpad.net/bugs/1720229

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 <[hidden email]>
Fixes: commit ca18d6f769d2 ("block: Make most scsi_req_init() calls implicit")
Signed-off-by: Bart Van Assche <[hidden email]>
Cc: Michael S. Tsirkin <[hidden email]>
Cc: Dann Frazier <[hidden email]>
Cc: <[hidden email]> # v4.13
Reviewed-by: Christoph Hellwig <[hidden email]>

Moved virtblk_initialize_rq() inside CONFIG_VIRTIO_BLK_SCSI.

Signed-off-by: Jens Axboe <[hidden email]>
(cherry picked from commit efea2abcb03215f2efadfe994ff7f652aaff196b)
Signed-off-by: dann frazier <[hidden email]>
---
 drivers/block/virtio_blk.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index d3d5523862c2..b49952b5a189 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -593,10 +593,22 @@ static int virtblk_map_queues(struct blk_mq_tag_set *set)
  return blk_mq_virtio_map_queues(set, vblk->vdev, 0);
 }
 
+#ifdef CONFIG_VIRTIO_BLK_SCSI
+static void virtblk_initialize_rq(struct request *req)
+{
+ struct virtblk_req *vbr = blk_mq_rq_to_pdu(req);
+
+ 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,
+#ifdef CONFIG_VIRTIO_BLK_SCSI
+ .initialize_rq_fn = virtblk_initialize_rq,
+#endif
  .map_queues = virtblk_map_queues,
 };
 
--
2.15.0.rc2


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [PATCH][SRU Artful] virtio_blk: Fix an SG_IO regression

Stefan Bader-2
On 02.11.2017 18:29, dann frazier wrote:

> From: Bart Van Assche <[hidden email]>
>
> BugLink: https://bugs.launchpad.net/bugs/1720229
>
> 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 <[hidden email]>
> Fixes: commit ca18d6f769d2 ("block: Make most scsi_req_init() calls implicit")
> Signed-off-by: Bart Van Assche <[hidden email]>
> Cc: Michael S. Tsirkin <[hidden email]>
> Cc: Dann Frazier <[hidden email]>
> Cc: <[hidden email]> # v4.13
> Reviewed-by: Christoph Hellwig <[hidden email]>
>
> Moved virtblk_initialize_rq() inside CONFIG_VIRTIO_BLK_SCSI.
>
> Signed-off-by: Jens Axboe <[hidden email]>
> (cherry picked from commit efea2abcb03215f2efadfe994ff7f652aaff196b)
> Signed-off-by: dann frazier <[hidden email]>
Acked-by: Stefan Bader <[hidden email]>

> ---
>  drivers/block/virtio_blk.c | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
>
> diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
> index d3d5523862c2..b49952b5a189 100644
> --- a/drivers/block/virtio_blk.c
> +++ b/drivers/block/virtio_blk.c
> @@ -593,10 +593,22 @@ static int virtblk_map_queues(struct blk_mq_tag_set *set)
>   return blk_mq_virtio_map_queues(set, vblk->vdev, 0);
>  }
>  
> +#ifdef CONFIG_VIRTIO_BLK_SCSI
> +static void virtblk_initialize_rq(struct request *req)
> +{
> + struct virtblk_req *vbr = blk_mq_rq_to_pdu(req);
> +
> + 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,
> +#ifdef CONFIG_VIRTIO_BLK_SCSI
> + .initialize_rq_fn = virtblk_initialize_rq,
> +#endif
>   .map_queues = virtblk_map_queues,
>  };
>  
>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (836 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

ACK: [PATCH][SRU Artful] virtio_blk: Fix an SG_IO regression

Kleber Souza
In reply to this post by dann frazier-4
On 11/02/17 18:29, dann frazier wrote:

> From: Bart Van Assche <[hidden email]>
>
> BugLink: https://bugs.launchpad.net/bugs/1720229
>
> 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 <[hidden email]>
> Fixes: commit ca18d6f769d2 ("block: Make most scsi_req_init() calls implicit")
> Signed-off-by: Bart Van Assche <[hidden email]>
> Cc: Michael S. Tsirkin <[hidden email]>
> Cc: Dann Frazier <[hidden email]>
> Cc: <[hidden email]> # v4.13
> Reviewed-by: Christoph Hellwig <[hidden email]>
>
> Moved virtblk_initialize_rq() inside CONFIG_VIRTIO_BLK_SCSI.
>
> Signed-off-by: Jens Axboe <[hidden email]>
> (cherry picked from commit efea2abcb03215f2efadfe994ff7f652aaff196b)
> Signed-off-by: dann frazier <[hidden email]>

Acked-by: Kleber Sacilotto de Souza <[hidden email]>

> ---
>  drivers/block/virtio_blk.c | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
>
> diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
> index d3d5523862c2..b49952b5a189 100644
> --- a/drivers/block/virtio_blk.c
> +++ b/drivers/block/virtio_blk.c
> @@ -593,10 +593,22 @@ static int virtblk_map_queues(struct blk_mq_tag_set *set)
>   return blk_mq_virtio_map_queues(set, vblk->vdev, 0);
>  }
>  
> +#ifdef CONFIG_VIRTIO_BLK_SCSI
> +static void virtblk_initialize_rq(struct request *req)
> +{
> + struct virtblk_req *vbr = blk_mq_rq_to_pdu(req);
> +
> + 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,
> +#ifdef CONFIG_VIRTIO_BLK_SCSI
> + .initialize_rq_fn = virtblk_initialize_rq,
> +#endif
>   .map_queues = virtblk_map_queues,
>  };
>  
>

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team