From b7dd20a0306cc457bf7e97cb33f014f9e1c466c6 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 11 Dec 2024 15:57:47 +0000 Subject: [PATCH] ANDROID: fix build breakage in virtio_transport_common.c In commit 946c7600fa22 ("virtio/vsock: Fix accept_queue memory leak"), a change is made that breaks the build due to previous changes being reverted in the Android tree to preserve the abi. Fix this up by resolving the build error so that the real bugfix still works properly. Fixes: 946c7600fa22 ("virtio/vsock: Fix accept_queue memory leak") Change-Id: Idd5754459814e3e7db7be1581de2af920b402f5a Signed-off-by: Greg Kroah-Hartman --- net/vmw_vsock/virtio_transport_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index ff2defb5d830..e2cb532497ea 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -1201,7 +1201,7 @@ virtio_transport_recv_listen(struct sock *sk, struct virtio_vsock_pkt *pkt, * Subsequent enqueues would lead to a memory leak. */ if (sk->sk_shutdown == SHUTDOWN_MASK) { - virtio_transport_reset_no_sock(t, skb); + virtio_transport_reset_no_sock(t, pkt); return -ESHUTDOWN; }