| Message ID | 2c3aeeac-2fcb-16f6-41cd-c0ca4e6a6d3e@sberdevices.ru (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ffa5395a7901e83a68d88207c4592962906641bd |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] vsock/vmci: convert VMCI error code to -ENOMEM on send | expand |
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Fri, 31 Mar 2023 10:56:41 +0300 you wrote: > This adds conversion of VMCI specific error code to general -ENOMEM. It > is needed, because af_vsock.c passes error value returned from transport > to the user, which does not expect to get VMCI_ERROR_* values. > > Fixes: c43170b7e157 ("vsock: return errors other than -ENOMEM to socket") > Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru> > Reviewed-by: Vishnu Dasa <vdasa@vmware.com> > Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> > > [...] Here is the summary with links: - [net] vsock/vmci: convert VMCI error code to -ENOMEM on send https://git.kernel.org/netdev/net/c/ffa5395a7901 You are awesome, thank you!
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c index 36eb16a40745..95cc4d79ba29 100644 --- a/net/vmw_vsock/vmci_transport.c +++ b/net/vmw_vsock/vmci_transport.c @@ -1842,7 +1842,13 @@ static ssize_t vmci_transport_stream_enqueue( struct msghdr *msg, size_t len) { - return vmci_qpair_enquev(vmci_trans(vsk)->qpair, msg, len, 0); + ssize_t err; + + err = vmci_qpair_enquev(vmci_trans(vsk)->qpair, msg, len, 0); + if (err < 0) + err = -ENOMEM; + + return err; } static s64 vmci_transport_stream_has_data(struct vsock_sock *vsk)
This adds conversion of VMCI specific error code to general -ENOMEM. It is needed, because af_vsock.c passes error value returned from transport to the user, which does not expect to get VMCI_ERROR_* values. Fixes: c43170b7e157 ("vsock: return errors other than -ENOMEM to socket") Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru> Reviewed-by: Vishnu Dasa <vdasa@vmware.com> Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> --- net/vmw_vsock/vmci_transport.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)