Skip to content
Snippets Groups Projects
Commit 35ac2733 authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Andrew Chant
Browse files

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:

fb7e2399 [TCP]: skb is unexpectedly freed.
0aea76d35c9651d55bbaf746e7914e5f9ae5a25d tcp: SYN packets are now
simply consumed

Bug: 35784697
Upstream commit: 5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4
Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Change-Id: I2d9c4bdd1e66861f6998d9e72c121a236cebf3d5
parent d68d3d4b
No related branches found
No related tags found
No related merge requests found
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment