From e8ad0104aff3acbfc2ab833ae9be6d24077ac6c2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 29 Nov 2023 12:58:36 +0000 Subject: [PATCH] Revert "virtio/vsock: Fix uninit-value in virtio_transport_recv_pkt()" This reverts commit cd12535b97dd7d18cf655ec78ce1cf1f29a576be which is commit 34c4effacfc329aeca5635a69fd9e0f6c90b4101 upstream. It needs to be reverted, as the function virtio_transport_free_pkt() is in the stable Android ABI, and this function is removed in the 6.1.63 kernel as part of a series of fixes and optimizations of the virtio networking connection. To preserve the ABI (and thereby keeping the slower interface), revert the commit for now. If this needs to come back in the future, if performance for this interface needs to be resolved, it can be done so in an ABI-safe way. Bug: 161946584 Change-Id: If55ecc4e35feecb35d8dffb8ae05680f5599d1da Signed-off-by: Greg Kroah-Hartman --- net/vmw_vsock/virtio_transport_common.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index 96058be4b5d6..a3e804b2057d 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -72,8 +72,6 @@ virtio_transport_alloc_skb(struct virtio_vsock_pkt_info *info, hdr->dst_port = cpu_to_le32(dst_port); hdr->flags = cpu_to_le32(info->flags); hdr->len = cpu_to_le32(len); - hdr->buf_alloc = cpu_to_le32(0); - hdr->fwd_cnt = cpu_to_le32(0); if (info->msg && len > 0) { payload = skb_put(skb, len);