diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2015-05-12 10:13:41 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2015-05-12 10:13:41 +0200 |
| commit | 8becdc18c3e1f855cae5af266f6a1f5ce5af24fb (patch) | |
| tree | c42e2d4274b1aa17a7822385535ac8524e4a6822 /net/ipv6/tcp_ipv6.c | |
| parent | 3c1b5c9bd991d1c023f736b0187582aae8a5b30a (diff) | |
| parent | 030bbdbf4c833bc69f502eae58498bc5572db736 (diff) | |
Merge tag 'v4.1-rc3' into devel
Linux 4.1-rc3
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index ad51df85aa00..b6575d665568 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -946,7 +946,8 @@ static struct sock *tcp_v6_hnd_req(struct sock *sk, struct sk_buff *skb) &ipv6_hdr(skb)->daddr, tcp_v6_iif(skb)); if (req) { nsk = tcp_check_req(sk, skb, req, false); - reqsk_put(req); + if (!nsk) + reqsk_put(req); return nsk; } nsk = __inet6_lookup_established(sock_net(sk), &tcp_hashinfo, |