From 6f278f1f573ff2bf476217edb440172bb294c13c Mon Sep 17 00:00:00 2001 From: Neal Cardwell Date: Sat, 23 Jun 2012 19:22:00 +0000 Subject: [PATCH] --- yaml --- r: 311418 b: refs/heads/master c: 437c5b53f63b468996090200df66ef2f3f588c80 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv6/tcp_ipv6.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a423ea93919e..a793c0bd79c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa809e2fd6e317226c046202a88520962672eac0 +refs/heads/master: 437c5b53f63b468996090200df66ef2f3f588c80 diff --git a/trunk/net/ipv6/tcp_ipv6.c b/trunk/net/ipv6/tcp_ipv6.c index 3a9aec29581a..9df64a50b075 100644 --- a/trunk/net/ipv6/tcp_ipv6.c +++ b/trunk/net/ipv6/tcp_ipv6.c @@ -1212,7 +1212,8 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb) tcp_rsk(req)->snt_isn = isn; tcp_rsk(req)->snt_synack = tcp_time_stamp; - security_inet_conn_request(sk, skb, req); + if (security_inet_conn_request(sk, skb, req)) + goto drop_and_release; if (tcp_v6_send_synack(sk, req, (struct request_values *)&tmp_ext,