UPSTREAM: packet: fix race condition in packet_set_ring
authorPhilip Pettersson <philip.pettersson@gmail.com>
Wed, 30 Nov 2016 22:55:36 +0000 (14:55 -0800)
committerLorenzo Colitti <lorenzo@google.com>
Fri, 13 Jan 2017 09:33:03 +0000 (09:33 +0000)
commita11f71fcd94d5315bc6fbfe74ec6c5cbb19104d1
tree2543e691d0f3079d1b72053fd43ea9b97a991e7e
parent56ea977b0fc3d2e7e68e5a93a2b44aa3e25e34ed
UPSTREAM: packet: fix race condition in packet_set_ring

(cherry picked from commit 84ac7260236a49c79eede91617700174c2c19b0c)

When packet_set_ring creates a ring buffer it will initialize a
struct timer_list if the packet version is TPACKET_V3. This value
can then be raced by a different thread calling setsockopt to
set the version to TPACKET_V1 before packet_set_ring has finished.

This leads to a use-after-free on a function pointer in the
struct timer_list when the socket is closed as the previously
initialized timer will not be deleted.

The bug is fixed by taking lock_sock(sk) in packet_setsockopt when
changing the packet version while also taking the lock at the start
of packet_set_ring.

Fixes: f6fb8f100b80 ("af-packet: TPACKET_V3 flexible buffer implementation.")
Signed-off-by: Philip Pettersson <philip.pettersson@gmail.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Change-Id: Ice451620ecf2c2a5ba3709f45fbb5f3f5c5bb389
Bug: 33358926
net/packet/af_packet.c