From 2c4de81708bcf4e5917f3d3bbc59b3df72ed13af Mon Sep 17 00:00:00 2001 From: Dan Aloni Date: Thu, 2 Mar 2017 01:37:24 +0200 Subject: [PATCH] Changes representative of linux-3.10.0-514.6.2.el7.tar.xz --- Makefile | 2 +- net/dccp/input.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9e242badfafc57..fcc1455194fbfd 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ EXTRAVERSION = NAME = Unicycling Gorilla RHEL_MAJOR = 7 RHEL_MINOR = 3 -RHEL_RELEASE = 514.6.1 +RHEL_RELEASE = 514.6.2 # # DRM backport version diff --git a/net/dccp/input.c b/net/dccp/input.c index 14cdafad7a9021..e511ccc74a0782 100644 --- 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;