diff options
author | Andrey Konovalov <andreyknvl@google.com> | 2017-02-16 17:22:46 +0100 |
---|---|---|
committer | Andrew Chant <achant@google.com> | 2017-05-17 02:44:02 +0000 |
commit | 0303e18fb561193a939edda495593107bdea02d2 (patch) | |
tree | 5a613d062867f84be2d529f80a413f31f001a9da | |
parent | 2a5970f41a6eed9bc3e9d2e5c9529aaa9f498aa2 (diff) | |
download | x86_64-0303e18fb561193a939edda495593107bdea02d2.tar.gz |
BACKPORT: UPSTREAM: dccp: fix freeing skb too early for IPV6_RECVPKTINFO
In the current DCCP implementation an skb for a DCCP_PKT_REQUEST packet
is forcibly freed via __kfree_skb in dccp_rcv_state_process if
dccp_v6_conn_request successfully returns.
However, if IPV6_RECVPKTINFO is set on a socket, the address of the skb
is saved to ireq->pktopts and the ref count for skb is incremented in
dccp_v6_conn_request, so skb is still in use. Nevertheless, it gets freed
in dccp_rcv_state_process.
Fix by calling consume_skb instead of doing goto discard and therefore
calling __kfree_skb.
Similar fixes for TCP:
fb7e2399ec17f1004c0e0ccfd17439f8759ede01 [TCP]: skb is unexpectedly freed.
0aea76d35c9651d55bbaf746e7914e5f9ae5a25d tcp: SYN packets are now
simply consumed
Bug: 35784697
Upstream commit: 5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Change-Id: I2d9c4bdd1e66861f6998d9e72c121a236cebf3d5
-rw-r--r-- | net/dccp/input.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/dccp/input.c b/net/dccp/input.c index 14cdafad7a90..e511ccc74a07 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; |