]> www.infradead.org Git - users/jedix/linux-maple.git/commit
dccp: fix freeing skb too early for IPV6_RECVPKTINFO
authorAndrey Konovalov <andreyknvl@google.com>
Thu, 16 Feb 2017 16:22:46 +0000 (17:22 +0100)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 23 Feb 2017 14:03:29 +0000 (06:03 -0800)
commitf4bc4177c4d40d79b25b817035f8b1bf30d76533
tree9bdf0f46884bc272e261a0a3f137485b127e0d5e
parent577eae93e9e41b034735c6567104f9a0ef2198c9
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

Orabug: 25585296
CVE-2017-6074

Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Aniket Alshi <aniket.alshi@oracle.com>
(cherry picked from commit 5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4)
Reviewed-by: Brian Maly <brian.maly@oracle.com>
net/dccp/input.c