]> www.infradead.org Git - users/jedix/linux-maple.git/commit
packet: in packet_do_bind, test fanout with bind_lock held
authorWillem de Bruijn <willemb@google.com>
Tue, 26 Sep 2017 16:19:37 +0000 (12:19 -0400)
committerKirtikar Kashyap <kirtikar.kashyap@oracle.com>
Thu, 16 Nov 2017 21:04:53 +0000 (13:04 -0800)
commit5c5c6ca85f12b70b1ed0d5e53d13d83fb911690a
tree5be1b449fec60573aea0eec495da9fc6bc63d24d
parentb4920736961e461dd026949957fd057241a06d70
packet: in packet_do_bind, test fanout with bind_lock held

Once a socket has po->fanout set, it remains a member of the group
until it is destroyed. The prot_hook must be constant and identical
across sockets in the group.

If fanout_add races with packet_do_bind between the test of po->fanout
and taking the lock, the bind call may make type or dev inconsistent
with that of the fanout group.

Hold po->bind_lock when testing po->fanout to avoid this race.

I had to introduce artificial delay (local_bh_enable) to actually
observe the race.

Fixes: dc99f600698d ("packet: Add fanout support.")
Signed-off-by: Willem de Bruijn <willemb@google.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 4971613c1639d8e5f102c4e797c3bf8f83a5a69e)

Orabug: 27050772
CVE: CVE-2017-15649

Signed-off-by: Kirtikar Kashyap <kirtikar.kashyap@oracle.com>
Reviewed-by: Jack Vogel <jack.vogel@oracle.com>
net/packet/af_packet.c