[ Sasha's backport helper bot ]
Hi,
Found matching upstream commit: 2cb7c756f605ec02ffe562fb26828e4bcc5fdfc1
Status in newer kernel trees:
6.12.y | Not found
6.6.y | Not found
6.1.y | Not found
5.15.y | Not found
Note: The patch differs from the upstream commit:
---
1: 2cb7c756f605e ! 1: 95bc6e4a9a892 vsock/virtio: discard packets if the transport changes
@@ Commit message
Signed-off-by: Stefano Garzarella <sgarzare@xxxxxxxxxx>
Reviewed-by: Hyunwoo Kim <v4bel@xxxxxxxxx>
Signed-off-by: Paolo Abeni <pabeni@xxxxxxxxxx>
+ (cherry picked from commit 2cb7c756f605ec02ffe562fb26828e4bcc5fdfc1)
+ [SG: fixed context conflict since this tree is missing commit 71dc9ec9ac7d
+ ("virtio/vsock: replace virtio_vsock_pkt with sk_buff")]
+ Signed-off-by: Stefano Garzarella <sgarzare@xxxxxxxxxx>
## net/vmw_vsock/virtio_transport_common.c ##
@@ net/vmw_vsock/virtio_transport_common.c: void virtio_transport_recv_pkt(struct virtio_transport *t,
@@ net/vmw_vsock/virtio_transport_common.c: void virtio_transport_recv_pkt(struct v
+ */
+ if (sock_flag(sk, SOCK_DONE) ||
+ (sk->sk_state != TCP_LISTEN && vsk->transport != &t->transport)) {
- (void)virtio_transport_reset_no_sock(t, skb);
+ (void)virtio_transport_reset_no_sock(t, pkt);
release_sock(sk);
sock_put(sk);
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.15.y | Success | Success |
