diff options
| author | Asias He <asias@redhat.com> | 2013-06-20 11:20:31 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-24 08:51:48 +0200 |
| commit | dce1a2877778fee172ab74411fcabd77bceb8e12 (patch) | |
| tree | b42a4643fc4380a665dcba93c71f9786df23584e /net/vmw_vsock | |
| parent | VSOCK: Introduce vsock_auto_bind helper (diff) | |
| download | linux-dce1a2877778fee172ab74411fcabd77bceb8e12.tar.xz linux-dce1a2877778fee172ab74411fcabd77bceb8e12.zip | |
VSOCK: Return VMCI_ERROR_NO_MEM when fails to allocate skb
vmci_transport_recv_dgram_cb always return VMCI_SUCESS even if we fail
to allocate skb, return VMCI_ERROR_NO_MEM instead.
Signed-off-by: Asias He <asias@redhat.com>
Acked-by: Andy King <acking@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/vmw_vsock')
| -rw-r--r-- | net/vmw_vsock/vmci_transport.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c index daff75200e25..99b511ddb4cb 100644 --- a/net/vmw_vsock/vmci_transport.c +++ b/net/vmw_vsock/vmci_transport.c @@ -625,13 +625,14 @@ static int vmci_transport_recv_dgram_cb(void *data, struct vmci_datagram *dg) /* Attach the packet to the socket's receive queue as an sk_buff. */ skb = alloc_skb(size, GFP_ATOMIC); - if (skb) { - /* sk_receive_skb() will do a sock_put(), so hold here. */ - sock_hold(sk); - skb_put(skb, size); - memcpy(skb->data, dg, size); - sk_receive_skb(sk, skb, 0); - } + if (!skb) + return VMCI_ERROR_NO_MEM; + + /* sk_receive_skb() will do a sock_put(), so hold here. */ + sock_hold(sk); + skb_put(skb, size); + memcpy(skb->data, dg, size); + sk_receive_skb(sk, skb, 0); return VMCI_SUCCESS; } |