Skip to content

Commit

Permalink
BACKPORT: UPSTREAM: dccp: fix freeing skb too early for IPV6_RECVPKTINFO
Browse files Browse the repository at this point in the history
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:

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

Bug: 35784697
Upstream commit: 5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4
Signed-off-by: Andrey Konovalov <[email protected]>
Acked-by: Eric Dumazet <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Change-Id: I2d9c4bdd1e66861f6998d9e72c121a236cebf3d5
Signed-off-by: Francisco Franco <[email protected]>
  • Loading branch information
xairy authored and franciscofranco committed Dec 9, 2017
1 parent 8652a2b commit 53e6924
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion net/dccp/input.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 53e6924

Please sign in to comment.