summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2009-10-19 19:41:06 +0000
committerDavid S. Miller <davem@davemloft.net>2009-10-20 00:51:57 -0700
commitb6b39e8f3fbbb31001b836afec87bcaf4811a7bf (patch)
tree33cf8d3732bde60abc7651b0ecf78e297d7b0afb /net
parent55b8050353c4a212c94d7156e2bd5885225b869b (diff)
downloadlinux-3.10-b6b39e8f3fbbb31001b836afec87bcaf4811a7bf.tar.gz
linux-3.10-b6b39e8f3fbbb31001b836afec87bcaf4811a7bf.tar.bz2
linux-3.10-b6b39e8f3fbbb31001b836afec87bcaf4811a7bf.zip
tcp: Try to catch MSG_PEEK bug
This patch tries to print out more information when we hit the MSG_PEEK bug in tcp_recvmsg. It's been around since at least 2005 and it's about time that we finally fix it. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/tcp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 9b2756fbdf9..90b2e0649bf 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1442,7 +1442,9 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
goto found_ok_skb;
if (tcp_hdr(skb)->fin)
goto found_fin_ok;
- WARN_ON(!(flags & MSG_PEEK));
+ if (WARN_ON(!(flags & MSG_PEEK)))
+ printk(KERN_INFO "recvmsg bug 2: copied %X "
+ "seq %X\n", *seq, TCP_SKB_CB(skb)->seq);
}
/* Well, if we have backlog, try to process it now yet. */