Merge pull request #45 from dm0-/v4.8.17-coreos

Apply CVE fix for beta
coreos · Feb 22, 2017 · 738e052 · 738e052
2 parents fd449a3 + 38fc515
commit 738e052
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/net/dccp/input.c b/net/dccp/input.c
@@ -606,7 +606,8 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
 			if (inet_csk(sk)->icsk_af_ops->conn_request(sk,
 								    skb) < 0)
 				return 1;
-			goto discard;
+			consume_skb(skb);
+			return 0;
 		}
 		if (dh->dccph_type == DCCP_PKT_RESET)
 			goto discard;