]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
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)
committerZefan Li <lizefan@huawei.com>
Thu, 22 Oct 2015 01:20:05 +0000 (09:20 +0800)
commit52686b9264cfdff747380f1bb70d11274fd83060
tree7e967243bf1be385fbf660b7a22edc0f9f2ebacd
parent2fb9a78c44b0801fb17f3f73f553b8416b96abe0
packet: avoid out of bounds read in round robin fanout

commit 468479e6043c84f5a65299cc07cb08a22a28c2b1 upstream.

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>
[lizf: Backported to 3.4:
 - adjust context
 - fanout_demux_lb() returns a pointer]
Signed-off-by: Zefan Li <lizefan@huawei.com>
net/packet/af_packet.c