vhost-vsock: fix use after free
Subsystems (6)
PATCH 1/1 vhost-vsock: fix use after free
The access of vsock is not protected by vhost_vsock_lock. This may lead use after free since vhost_vsock_dev_release() may free the pointer at the same time.
Fix this by holding the lock during the acess.
---
- The patch is needed for -stable.
--- drivers/vhost/vsock.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-)
drivers/vhost/vsock.c +19 -7
@@ -210,21 +210,27 @@ vhost_transport_send_pkt(struct virtio_vsock_pkt *pkt)struct vhost_vsock *vsock;int len = pkt->len; +spin_lock_bh (&vhost_vsock_lock); +/* Find the vhost_vsock according to guest context id */ - vsock =vhost_vsock_get (le64_to_cpu (pkt->hdr.dst_cid)); + vsock =__vhost_vsock_get (le64_to_cpu (pkt->hdr.dst_cid));if (!vsock) {virtio_transport_free_pkt (pkt); +spin_unlock_bh (&vhost_vsock_lock);return -ENODEV ; }if (pkt->reply)atomic_inc (&vsock->queued_replies); -spin_lock_bh (&vsock->send_pkt_list_lock); +spin_lock (&vsock->send_pkt_list_lock);list_add_tail (&pkt->list, &vsock->send_pkt_list); -spin_unlock_bh (&vsock->send_pkt_list_lock); +spin_unlock (&vsock->send_pkt_list_lock);vhost_work_queue (&vsock->dev, &vsock->send_pkt_work); + +spin_unlock_bh (&vhost_vsock_lock); +return len; }
@@ -236,18 +242,22 @@ vhost_transport_cancel_pkt(struct vsock_sock *vsk)int cnt =0 ;LIST_HEAD (freeme); +spin_lock_bh (&vhost_vsock_lock); +/* Find the vhost_vsock according to guest context id */ - vsock =vhost_vsock_get (vsk->remote_addr.svm_cid); -if (!vsock) + vsock =__vhost_vsock_get (vsk->remote_addr.svm_cid); +if (!vsock) { +spin_unlock_bh (&vhost_vsock_lock);return -ENODEV ; + } -spin_lock_bh (&vsock->send_pkt_list_lock); +spin_lock (&vsock->send_pkt_list_lock);list_for_each_entry_safe (pkt, n, &vsock->send_pkt_list, list) {if (pkt->vsk != vsk)continue ;list_move (&pkt->list, &freeme); } -spin_unlock_bh (&vsock->send_pkt_list_lock); +spin_unlock (&vsock->send_pkt_list_lock);list_for_each_entry_safe (pkt, n, &freeme, list) {if (pkt->reply)
@@ -265,6 +275,8 @@ vhost_transport_cancel_pkt(struct vsock_sock *vsk)vhost_poll_queue (&tx_vq->poll); } +spin_unlock_bh (&vhost_vsock_lock); +return 0 ; }
Signature · 1 line
2.17.1
Hello!
On 9/27/2018 11:43 AM, Jason Wang wrote:
Just a couple of typos...
Quoted 2 lines
The access of vsock is not protected by
vhost_vsock_lock. This may lead use after free sincevhost_vsock_dev_release()may free the
Lead to use.
Quoted 3 lines
pointer at the same time.
Fix this by holding the lock during the acess.
Access.
Quoted 5 lines
Reported-by [email protected]Fixes 16320f363ae1 ("vhost-vsock: add pkt cancel capability")Fixes 433fc58e6bf2 ("VSOCK: Introduce vhost_vsock.ko")Cc Stefan Hajnoczi <[email protected]>Signed-off-by Jason Wang <[email protected]>
[...]
MBR, Sergei
Quoted 17 lines · Sergei Shtylyov
Hello!
On 9/27/2018 11:43 AM, Jason Wang wrote:
Just a couple of typos...
Quoted 2 lines
The access of vsock is not protected by
vhost_vsock_lock. This may lead use after free sincevhost_vsock_dev_release()may free theLead to use.
Quoted 3 lines
pointer at the same time.
Fix this by holding the lock during the acess.
Access.
Quoted 8 lines
Quoted 5 lines
Reported-by [email protected]Fixes 16320f363ae1 ("vhost-vsock: add pkt cancel capability")Fixes 433fc58e6bf2 ("VSOCK: Introduce vhost_vsock.ko")Cc Stefan Hajnoczi <[email protected]>Signed-off-by Jason Wang <[email protected]>[...]
MBR, Sergei
Let me post V2.
Thanks
Quoted 17 lines · Sergei Shtylyov
Hello!
On 9/27/2018 11:43 AM, Jason Wang wrote:
Just a couple of typos...
Quoted 2 lines
The access of vsock is not protected by
vhost_vsock_lock. This may lead use after free sincevhost_vsock_dev_release()may free theLead to use.
Quoted 3 lines
pointer at the same time.
Fix this by holding the lock during the acess.
Access.
Quoted 8 lines
Quoted 5 lines
Reported-by [email protected]Fixes 16320f363ae1 ("vhost-vsock: add pkt cancel capability")Fixes 433fc58e6bf2 ("VSOCK: Introduce vhost_vsock.ko")Cc Stefan Hajnoczi <[email protected]>Signed-off-by Jason Wang <[email protected]>[...]
MBR, Sergei
Let me post V2.
Thanks
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Hello!
On 9/27/2018 11:43 AM, Jason Wang wrote:
Just a couple of typos...
Quoted 2 lines
The access of vsock is not protected by
vhost_vsock_lock. This may lead use after free sincevhost_vsock_dev_release()may free the
Lead to use.
Quoted 3 lines
pointer at the same time.
Fix this by holding the lock during the acess.
Access.
Quoted 5 lines
Reported-by [email protected]Fixes 16320f363ae1 ("vhost-vsock: add pkt cancel capability")Fixes 433fc58e6bf2 ("VSOCK: Introduce vhost_vsock.ko")Cc Stefan Hajnoczi <[email protected]>Signed-off-by Jason Wang <[email protected]>
[...]
MBR, Sergei