packet: avoid out of bounds read in round robin fanout
authorWillem de Bruijn <willemb@google.com>
Wed, 17 Jun 2015 19:59:34 +0000 (15:59 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Jul 2015 17:40:20 +0000 (10:40 -0700)
commit4552ddd07a1f2f502243cb8d4609f1e3fad57958
treecbab90b09ed4f409c18ca78c120710be248c8ed9
parent7eee92bf2e54235ab90f90d4b97b9256f51b076d
packet: avoid out of bounds read in round robin fanout

[ Upstream commit 468479e6043c84f5a65299cc07cb08a22a28c2b1 ]

PACKET_FANOUT_LB computes f->rr_cur such that it is modulo
f->num_members. It returns the old value unconditionally, but
f->num_members may have changed since the last store. Ensure
that the return value is always < num.

When modifying the logic, simplify it further by replacing the loop
with an unconditional atomic increment.

Fixes: dc99f600698d ("packet: Add fanout support.")
Suggested-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Willem de Bruijn <willemb@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/packet/af_packet.c