diff mbox series

vsock fix for 5.4 stable

Message ID 4871038a-6ab7-4c44-875c-2d04012de34a@apple.com
State New
Headers show
Series vsock fix for 5.4 stable | expand

Commit Message

Vishnu Rangayyan Sept. 29, 2020, 8:53 p.m. UTC
Hi,

Can we have this backport applied to 5.4 stable, its more of a required 
fix than an enhancement.

commit df12eb6d6cd920ab2f0e0a43cd6e1c23a05cea91 upstream

The call has a minor api change in 5.4 vs higher, only the pkt arg is 
required.

  	}
--

Comments

Greg Kroah-Hartman Sept. 30, 2020, 6:26 a.m. UTC | #1
On Tue, Sep 29, 2020 at 01:53:58PM -0700, Vishnu Rangayyan wrote:
> Hi,

> 

> Can we have this backport applied to 5.4 stable, its more of a required fix

> than an enhancement.

> 

> commit df12eb6d6cd920ab2f0e0a43cd6e1c23a05cea91 upstream

> 

> The call has a minor api change in 5.4 vs higher, only the pkt arg is

> required.

> 

> diff --git a/net/vmw_vsock/virtio_transport_common.c

> b/net/vmw_vsock/virtio_transport_common.c

> index d9f0c9c5425a..2f696124bab6 100644

> --- a/net/vmw_vsock/virtio_transport_common.c

> +++ b/net/vmw_vsock/virtio_transport_common.c

> @@ -1153,6 +1153,7 @@ void virtio_transport_recv_pkt(struct virtio_transport

> *t,

>  		virtio_transport_free_pkt(pkt);

>  		break;

>  	default:

> +		(void)virtio_transport_reset_no_sock(pkt);

>  		virtio_transport_free_pkt(pkt);

>  		break;

>  	}

> -- 


Please cc: netdev and the developers who wrote/reviewed a patch when
asking for it to be submitted to stable, so that they can comment on it.

Can you resend it and do that?

thanks,

greg k-h
diff mbox series

Patch

diff --git a/net/vmw_vsock/virtio_transport_common.c 
b/net/vmw_vsock/virtio_transport_common.c
index d9f0c9c5425a..2f696124bab6 100644
--- a/net/vmw_vsock/virtio_transport_common.c
+++ b/net/vmw_vsock/virtio_transport_common.c
@@ -1153,6 +1153,7 @@  void virtio_transport_recv_pkt(struct 
virtio_transport *t,
  		virtio_transport_free_pkt(pkt);
  		break;
  	default:
+		(void)virtio_transport_reset_no_sock(pkt);
  		virtio_transport_free_pkt(pkt);
  		break;