* [PATCH net] vsock/virtio: update credit only if socket is not closed
@ 2021-02-08 14:44 Stefano Garzarella
2021-02-08 18:32 ` Michael S. Tsirkin
2021-02-08 21:40 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Stefano Garzarella @ 2021-02-08 14:44 UTC (permalink / raw)
To: kuba
Cc: virtualization, netdev, David S. Miller, linux-kernel, kvm,
Asias He, Michael S. Tsirkin, Claudio Imbrenda, Stefan Hajnoczi,
Stefano Garzarella
If the socket is closed or is being released, some resources used by
virtio_transport_space_update() such as 'vsk->trans' may be released.
To avoid a use after free bug we should only update the available credit
when we are sure the socket is still open and we have the lock held.
Fixes: 06a8fc78367d ("VSOCK: Introduce virtio_vsock_common.ko")
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
net/vmw_vsock/virtio_transport_common.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
index 5956939eebb7..e4370b1b7494 100644
--- a/net/vmw_vsock/virtio_transport_common.c
+++ b/net/vmw_vsock/virtio_transport_common.c
@@ -1130,8 +1130,6 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
vsk = vsock_sk(sk);
- space_available = virtio_transport_space_update(sk, pkt);
-
lock_sock(sk);
/* Check if sk has been closed before lock_sock */
@@ -1142,6 +1140,8 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
goto free_pkt;
}
+ space_available = virtio_transport_space_update(sk, pkt);
+
/* Update CID in case it has changed after a transport reset event */
vsk->local_addr.svm_cid = dst.svm_cid;
--
2.29.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net] vsock/virtio: update credit only if socket is not closed
2021-02-08 14:44 [PATCH net] vsock/virtio: update credit only if socket is not closed Stefano Garzarella
@ 2021-02-08 18:32 ` Michael S. Tsirkin
2021-02-08 21:40 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Michael S. Tsirkin @ 2021-02-08 18:32 UTC (permalink / raw)
To: Stefano Garzarella
Cc: kuba, virtualization, netdev, David S. Miller, linux-kernel, kvm,
Asias He, Claudio Imbrenda, Stefan Hajnoczi
On Mon, Feb 08, 2021 at 03:44:54PM +0100, Stefano Garzarella wrote:
> If the socket is closed or is being released, some resources used by
> virtio_transport_space_update() such as 'vsk->trans' may be released.
>
> To avoid a use after free bug we should only update the available credit
> when we are sure the socket is still open and we have the lock held.
>
> Fixes: 06a8fc78367d ("VSOCK: Introduce virtio_vsock_common.ko")
> Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Probably stable material.
> ---
> net/vmw_vsock/virtio_transport_common.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
> index 5956939eebb7..e4370b1b7494 100644
> --- a/net/vmw_vsock/virtio_transport_common.c
> +++ b/net/vmw_vsock/virtio_transport_common.c
> @@ -1130,8 +1130,6 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
>
> vsk = vsock_sk(sk);
>
> - space_available = virtio_transport_space_update(sk, pkt);
> -
> lock_sock(sk);
>
> /* Check if sk has been closed before lock_sock */
> @@ -1142,6 +1140,8 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
> goto free_pkt;
> }
>
> + space_available = virtio_transport_space_update(sk, pkt);
> +
> /* Update CID in case it has changed after a transport reset event */
> vsk->local_addr.svm_cid = dst.svm_cid;
>
> --
> 2.29.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net] vsock/virtio: update credit only if socket is not closed
2021-02-08 14:44 [PATCH net] vsock/virtio: update credit only if socket is not closed Stefano Garzarella
2021-02-08 18:32 ` Michael S. Tsirkin
@ 2021-02-08 21:40 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-02-08 21:40 UTC (permalink / raw)
To: Stefano Garzarella
Cc: kuba, virtualization, netdev, davem, linux-kernel, kvm, asias,
mst, imbrenda, stefanha
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
On Mon, 8 Feb 2021 15:44:54 +0100 you wrote:
> If the socket is closed or is being released, some resources used by
> virtio_transport_space_update() such as 'vsk->trans' may be released.
>
> To avoid a use after free bug we should only update the available credit
> when we are sure the socket is still open and we have the lock held.
>
> Fixes: 06a8fc78367d ("VSOCK: Introduce virtio_vsock_common.ko")
> Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
>
> [...]
Here is the summary with links:
- [net] vsock/virtio: update credit only if socket is not closed
https://git.kernel.org/netdev/net/c/ce7536bc7398
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-08 21:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-08 14:44 [PATCH net] vsock/virtio: update credit only if socket is not closed Stefano Garzarella
2021-02-08 18:32 ` Michael S. Tsirkin
2021-02-08 21:40 ` patchwork-bot+netdevbpf
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).