summaryrefslogtreecommitdiff
path: root/net/ipv4/tcp_input.c
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-11-07 17:59:14 -0600
committerRob Herring <rob.herring@calxeda.com>2012-11-07 17:59:14 -0600
commitd3ad4a60a1b1448e59914eebefe1ccc8e64f9e2f (patch)
treef0862d1905a599cdbad86fcc8816d86a6f33459f /net/ipv4/tcp_input.c
parente095c0d122c09efabe7d4136ce77f72c636c4879 (diff)
parente5c5f2adeb370559f4b221d57214db85858b786a (diff)
Merge remote-tracking branch 'arm-soc/devel/debug_ll_init' into debug_ll
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r--net/ipv4/tcp_input.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 1db663983587..2c2b13a999ea 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;