From 02ab7c7bb57e138c7e7adec5b2c2bec33066e8ec Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Wed, 2 Nov 2011 12:42:56 +0000 Subject: [PATCH] --- yaml --- r: 273520 b: refs/heads/master c: 918eb39962dfff9490a43cd08176b962cacc7978 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/dccp/ipv4.c | 1 + trunk/net/ipv4/tcp_ipv4.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 737991e569af..ea419270ed15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2e210c0238eb7073e07af503ae743fa53977120 +refs/heads/master: 918eb39962dfff9490a43cd08176b962cacc7978 diff --git a/trunk/net/dccp/ipv4.c b/trunk/net/dccp/ipv4.c index 332639b56f4d..90a919afbed7 100644 --- a/trunk/net/dccp/ipv4.c +++ b/trunk/net/dccp/ipv4.c @@ -433,6 +433,7 @@ struct sock *dccp_v4_request_recv_sock(struct sock *sk, struct sk_buff *skb, NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS); return NULL; put_and_exit: + bh_unlock_sock(newsk); sock_put(newsk); goto exit; } diff --git a/trunk/net/ipv4/tcp_ipv4.c b/trunk/net/ipv4/tcp_ipv4.c index 939c55eceb5b..a7443159c400 100644 --- a/trunk/net/ipv4/tcp_ipv4.c +++ b/trunk/net/ipv4/tcp_ipv4.c @@ -1510,6 +1510,7 @@ struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb, NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS); return NULL; put_and_exit: + bh_unlock_sock(newsk); sock_put(newsk); goto exit; }