* Re: [PATCH] virtio-scsi: Fix hotcpu_notifier use-after-free with virtscsi_freeze
2013-10-28 8:01 [PATCH] virtio-scsi: Fix hotcpu_notifier use-after-free with virtscsi_freeze Asias He
@ 2013-10-28 10:29 ` Paolo Bonzini
2013-10-29 3:27 ` Jason Wang
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Paolo Bonzini @ 2013-10-28 10:29 UTC (permalink / raw)
To: Asias He; +Cc: linux-scsi, kvm, virtualization, stable
Il 28/10/2013 09:01, Asias He ha scritto:
> vqs are freed in virtscsi_freeze but the hotcpu_notifier is not
> unregistered. We will have a use-after-free usage when the notifier
> callback is called after virtscsi_freeze.
>
> Signed-off-by: Asias He <asias@redhat.com>
> ---
> drivers/scsi/virtio_scsi.c | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
> index 74b88ef..b26f1a5 100644
> --- a/drivers/scsi/virtio_scsi.c
> +++ b/drivers/scsi/virtio_scsi.c
> @@ -957,6 +957,10 @@ static void virtscsi_remove(struct virtio_device *vdev)
> #ifdef CONFIG_PM
> static int virtscsi_freeze(struct virtio_device *vdev)
> {
> + struct Scsi_Host *sh = virtio_scsi_host(vdev);
> + struct virtio_scsi *vscsi = shost_priv(sh);
> +
> + unregister_hotcpu_notifier(&vscsi->nb);
> virtscsi_remove_vqs(vdev);
> return 0;
> }
> @@ -965,8 +969,17 @@ static int virtscsi_restore(struct virtio_device *vdev)
> {
> struct Scsi_Host *sh = virtio_scsi_host(vdev);
> struct virtio_scsi *vscsi = shost_priv(sh);
> + int err;
> +
> + err = virtscsi_init(vdev, vscsi);
> + if (err)
> + return err;
> +
> + err = register_hotcpu_notifier(&vscsi->nb);
> + if (err)
> + vdev->config->del_vqs(vdev);
>
> - return virtscsi_init(vdev, vscsi);
> + return err;
> }
> #endif
>
>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Cc: stable@vger.kernel.org
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] virtio-scsi: Fix hotcpu_notifier use-after-free with virtscsi_freeze
2013-10-28 8:01 [PATCH] virtio-scsi: Fix hotcpu_notifier use-after-free with virtscsi_freeze Asias He
2013-10-28 10:29 ` Paolo Bonzini
@ 2013-10-29 3:27 ` Jason Wang
2013-10-29 5:50 ` Wanlong Gao
2013-12-12 6:32 ` Jason Wang
3 siblings, 0 replies; 7+ messages in thread
From: Jason Wang @ 2013-10-29 3:27 UTC (permalink / raw)
To: Asias He, kvm; +Cc: pbonzini, linux-scsi, virtualization
On 10/28/2013 04:01 PM, Asias He wrote:
> vqs are freed in virtscsi_freeze but the hotcpu_notifier is not
> unregistered. We will have a use-after-free usage when the notifier
> callback is called after virtscsi_freeze.
>
> Signed-off-by: Asias He <asias@redhat.com>
> ---
> drivers/scsi/virtio_scsi.c | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
> index 74b88ef..b26f1a5 100644
> --- a/drivers/scsi/virtio_scsi.c
> +++ b/drivers/scsi/virtio_scsi.c
> @@ -957,6 +957,10 @@ static void virtscsi_remove(struct virtio_device *vdev)
> #ifdef CONFIG_PM
> static int virtscsi_freeze(struct virtio_device *vdev)
> {
> + struct Scsi_Host *sh = virtio_scsi_host(vdev);
> + struct virtio_scsi *vscsi = shost_priv(sh);
> +
> + unregister_hotcpu_notifier(&vscsi->nb);
> virtscsi_remove_vqs(vdev);
> return 0;
> }
> @@ -965,8 +969,17 @@ static int virtscsi_restore(struct virtio_device *vdev)
> {
> struct Scsi_Host *sh = virtio_scsi_host(vdev);
> struct virtio_scsi *vscsi = shost_priv(sh);
> + int err;
> +
> + err = virtscsi_init(vdev, vscsi);
> + if (err)
> + return err;
> +
> + err = register_hotcpu_notifier(&vscsi->nb);
> + if (err)
> + vdev->config->del_vqs(vdev);
>
> - return virtscsi_init(vdev, vscsi);
> + return err;
> }
> #endif
>
Acked-by: Jason Wang <jasowang@redhat.com>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] virtio-scsi: Fix hotcpu_notifier use-after-free with virtscsi_freeze
2013-10-28 8:01 [PATCH] virtio-scsi: Fix hotcpu_notifier use-after-free with virtscsi_freeze Asias He
2013-10-28 10:29 ` Paolo Bonzini
2013-10-29 3:27 ` Jason Wang
@ 2013-10-29 5:50 ` Wanlong Gao
2013-12-12 6:32 ` Jason Wang
3 siblings, 0 replies; 7+ messages in thread
From: Wanlong Gao @ 2013-10-29 5:50 UTC (permalink / raw)
To: Asias He, kvm; +Cc: pbonzini, linux-scsi, virtualization
On 10/28/2013 04:01 PM, Asias He wrote:
> vqs are freed in virtscsi_freeze but the hotcpu_notifier is not
> unregistered. We will have a use-after-free usage when the notifier
> callback is called after virtscsi_freeze.
>
> Signed-off-by: Asias He <asias@redhat.com>
Reviewed-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
> ---
> drivers/scsi/virtio_scsi.c | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
> index 74b88ef..b26f1a5 100644
> --- a/drivers/scsi/virtio_scsi.c
> +++ b/drivers/scsi/virtio_scsi.c
> @@ -957,6 +957,10 @@ static void virtscsi_remove(struct virtio_device *vdev)
> #ifdef CONFIG_PM
> static int virtscsi_freeze(struct virtio_device *vdev)
> {
> + struct Scsi_Host *sh = virtio_scsi_host(vdev);
> + struct virtio_scsi *vscsi = shost_priv(sh);
> +
> + unregister_hotcpu_notifier(&vscsi->nb);
> virtscsi_remove_vqs(vdev);
> return 0;
> }
> @@ -965,8 +969,17 @@ static int virtscsi_restore(struct virtio_device *vdev)
> {
> struct Scsi_Host *sh = virtio_scsi_host(vdev);
> struct virtio_scsi *vscsi = shost_priv(sh);
> + int err;
> +
> + err = virtscsi_init(vdev, vscsi);
> + if (err)
> + return err;
> +
> + err = register_hotcpu_notifier(&vscsi->nb);
> + if (err)
> + vdev->config->del_vqs(vdev);
>
> - return virtscsi_init(vdev, vscsi);
> + return err;
> }
> #endif
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] virtio-scsi: Fix hotcpu_notifier use-after-free with virtscsi_freeze
2013-10-28 8:01 [PATCH] virtio-scsi: Fix hotcpu_notifier use-after-free with virtscsi_freeze Asias He
` (2 preceding siblings ...)
2013-10-29 5:50 ` Wanlong Gao
@ 2013-12-12 6:32 ` Jason Wang
2013-12-17 3:09 ` Rusty Russell
3 siblings, 1 reply; 7+ messages in thread
From: Jason Wang @ 2013-12-12 6:32 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-scsi, kvm, virtualization, pbonzini, Asias He
On 10/28/2013 04:01 PM, Asias He wrote:
> vqs are freed in virtscsi_freeze but the hotcpu_notifier is not
> unregistered. We will have a use-after-free usage when the notifier
> callback is called after virtscsi_freeze.
>
> Signed-off-by: Asias He <asias@redhat.com>
> ---
> drivers/scsi/virtio_scsi.c | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
> index 74b88ef..b26f1a5 100644
> --- a/drivers/scsi/virtio_scsi.c
> +++ b/drivers/scsi/virtio_scsi.c
> @@ -957,6 +957,10 @@ static void virtscsi_remove(struct virtio_device *vdev)
> #ifdef CONFIG_PM
> static int virtscsi_freeze(struct virtio_device *vdev)
> {
> + struct Scsi_Host *sh = virtio_scsi_host(vdev);
> + struct virtio_scsi *vscsi = shost_priv(sh);
> +
> + unregister_hotcpu_notifier(&vscsi->nb);
> virtscsi_remove_vqs(vdev);
> return 0;
> }
> @@ -965,8 +969,17 @@ static int virtscsi_restore(struct virtio_device *vdev)
> {
> struct Scsi_Host *sh = virtio_scsi_host(vdev);
> struct virtio_scsi *vscsi = shost_priv(sh);
> + int err;
> +
> + err = virtscsi_init(vdev, vscsi);
> + if (err)
> + return err;
> +
> + err = register_hotcpu_notifier(&vscsi->nb);
> + if (err)
> + vdev->config->del_vqs(vdev);
>
> - return virtscsi_init(vdev, vscsi);
> + return err;
> }
> #endif
>
Ping. Rusty, could you please review and apply this patch?
Thanks
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] virtio-scsi: Fix hotcpu_notifier use-after-free with virtscsi_freeze
2013-12-12 6:32 ` Jason Wang
@ 2013-12-17 3:09 ` Rusty Russell
2013-12-17 4:46 ` Jason Wang
0 siblings, 1 reply; 7+ messages in thread
From: Rusty Russell @ 2013-12-17 3:09 UTC (permalink / raw)
To: Jason Wang; +Cc: linux-scsi, kvm, virtualization, pbonzini, Asias He
Jason Wang <jasowang@redhat.com> writes:
> On 10/28/2013 04:01 PM, Asias He wrote:
>> vqs are freed in virtscsi_freeze but the hotcpu_notifier is not
>> unregistered. We will have a use-after-free usage when the notifier
>> callback is called after virtscsi_freeze.
>>
>> Signed-off-by: Asias He <asias@redhat.com>
Please include a Fixes: line, especially if you want the CC: stable.
Thanks,
Rusty.
>> ---
>> drivers/scsi/virtio_scsi.c | 15 ++++++++++++++-
>> 1 file changed, 14 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
>> index 74b88ef..b26f1a5 100644
>> --- a/drivers/scsi/virtio_scsi.c
>> +++ b/drivers/scsi/virtio_scsi.c
>> @@ -957,6 +957,10 @@ static void virtscsi_remove(struct virtio_device *vdev)
>> #ifdef CONFIG_PM
>> static int virtscsi_freeze(struct virtio_device *vdev)
>> {
>> + struct Scsi_Host *sh = virtio_scsi_host(vdev);
>> + struct virtio_scsi *vscsi = shost_priv(sh);
>> +
>> + unregister_hotcpu_notifier(&vscsi->nb);
>> virtscsi_remove_vqs(vdev);
>> return 0;
>> }
>> @@ -965,8 +969,17 @@ static int virtscsi_restore(struct virtio_device *vdev)
>> {
>> struct Scsi_Host *sh = virtio_scsi_host(vdev);
>> struct virtio_scsi *vscsi = shost_priv(sh);
>> + int err;
>> +
>> + err = virtscsi_init(vdev, vscsi);
>> + if (err)
>> + return err;
>> +
>> + err = register_hotcpu_notifier(&vscsi->nb);
>> + if (err)
>> + vdev->config->del_vqs(vdev);
>>
>> - return virtscsi_init(vdev, vscsi);
>> + return err;
>> }
>> #endif
>>
>
> Ping. Rusty, could you please review and apply this patch?
>
> Thanks
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] virtio-scsi: Fix hotcpu_notifier use-after-free with virtscsi_freeze
2013-12-17 3:09 ` Rusty Russell
@ 2013-12-17 4:46 ` Jason Wang
0 siblings, 0 replies; 7+ messages in thread
From: Jason Wang @ 2013-12-17 4:46 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-scsi, kvm, virtualization, pbonzini, Asias He
On 12/17/2013 11:09 AM, Rusty Russell wrote:
> Jason Wang <jasowang@redhat.com> writes:
>> > On 10/28/2013 04:01 PM, Asias He wrote:
>>> >> vqs are freed in virtscsi_freeze but the hotcpu_notifier is not
>>> >> unregistered. We will have a use-after-free usage when the notifier
>>> >> callback is called after virtscsi_freeze.
>>> >>
>>> >> Signed-off-by: Asias He <asias@redhat.com>
> Please include a Fixes: line, especially if you want the CC: stable.
>
> Thanks,
> Rusty.
>
>
Ok, will post V2 soon.
^ permalink raw reply [flat|nested] 7+ messages in thread