From 0f4ea372a982acf66f00a9c2df3e4e239c460624 Mon Sep 17 00:00:00 2001 From: Zhu Yi Date: Thu, 4 Mar 2010 18:01:41 +0000 Subject: [PATCH] --- yaml --- r: 187937 b: refs/heads/master c: 6b03a53a5ab7ccf2d5d69f96cf1c739c4d2a8fb9 h: refs/heads/master i: 187935: 53c2a20627082a40cd0f98422a99f72c4f892c8f v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_ipv4.c | 6 ++++-- trunk/net/ipv6/tcp_ipv6.c | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 18fafe922c85..88bda0b7a942 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8eae939f1400326b06d0c9afe53d2a484a326871 +refs/heads/master: 6b03a53a5ab7ccf2d5d69f96cf1c739c4d2a8fb9 diff --git a/trunk/net/ipv4/tcp_ipv4.c b/trunk/net/ipv4/tcp_ipv4.c index c3588b4fd979..4baf1943b1bd 100644 --- a/trunk/net/ipv4/tcp_ipv4.c +++ b/trunk/net/ipv4/tcp_ipv4.c @@ -1682,8 +1682,10 @@ int tcp_v4_rcv(struct sk_buff *skb) if (!tcp_prequeue(sk, skb)) ret = tcp_v4_do_rcv(sk, skb); } - } else - sk_add_backlog(sk, skb); + } else if (sk_add_backlog_limited(sk, skb)) { + bh_unlock_sock(sk); + goto discard_and_relse; + } bh_unlock_sock(sk); sock_put(sk); diff --git a/trunk/net/ipv6/tcp_ipv6.c b/trunk/net/ipv6/tcp_ipv6.c index 6963a6b6763e..c4ea9d5cbfaa 100644 --- a/trunk/net/ipv6/tcp_ipv6.c +++ b/trunk/net/ipv6/tcp_ipv6.c @@ -1740,8 +1740,10 @@ static int tcp_v6_rcv(struct sk_buff *skb) if (!tcp_prequeue(sk, skb)) ret = tcp_v6_do_rcv(sk, skb); } - } else - sk_add_backlog(sk, skb); + } else if (sk_add_backlog_limited(sk, skb)) { + bh_unlock_sock(sk); + goto discard_and_relse; + } bh_unlock_sock(sk); sock_put(sk);