diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2012-11-21 10:51:39 +0100 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2012-11-21 10:51:39 +0100 |
| commit | 84d2e38e935620004245f0e22113cf8389834635 (patch) | |
| tree | 67b3bbdaf6115357098ed8db05654b823c135ccb /net/ipv4/tcp_input.c | |
| parent | 91dc985c5e51af7036c1ccf9cea1b05662c96791 (diff) | |
| parent | e5c5f2adeb370559f4b221d57214db85858b786a (diff) | |
| download | olio-linux-3.10-84d2e38e935620004245f0e22113cf8389834635.tar.xz olio-linux-3.10-84d2e38e935620004245f0e22113cf8389834635.zip | |
Merge branch 'devel/debug_ll_init' into zynq/multiplatform
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 1db66398358..2c2b13a999e 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -4529,6 +4529,9 @@ int tcp_send_rcvq(struct sock *sk, struct msghdr *msg, size_t size) struct tcphdr *th; bool fragstolen; + if (size == 0) + return 0; + skb = alloc_skb(size + sizeof(*th), sk->sk_allocation); if (!skb) goto err; |