| Message ID | 20210208144454.84438-1-sgarzare@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ce7536bc7398e2ae552d2fabb7e0e371a9f1fe46 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] vsock/virtio: update credit only if socket is not closed | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 10 of 10 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 16 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
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
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
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;
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(-)