---

yaml --- r: 311418 b: refs/heads/master c: 437c5b5 h: refs/heads/master v: v3
git-mirror · Jun 25, 2012 · 6f278f1 · 6f278f1
1 parent 34700c9
commit 6f278f1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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,