diff options
| author | Willem de Bruijn <willemb@google.com> | 2015-06-17 15:59:34 -0400 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-07-05 10:12:58 -0400 |
| commit | 154dcd0b49c499f2c5846e6d85a48735a67b0929 (patch) | |
| tree | 5990f6b6f995806def4204a432b0f22d5b89ac35 | |
| parent | 5c0e1a6b445f6709873959d69b367bc7f0c4ff06 (diff) | |
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: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | net/packet/af_packet.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index d465f9f87f78..5dcfe05ea232 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -1255,16 +1255,6 @@ static void packet_sock_destruct(struct sock *sk) sk_refcnt_debug_dec(sk); } -static int fanout_rr_next(struct packet_fanout *f, unsigned int num) -{ - int x = atomic_read(&f->rr_cur) + 1; - - if (x >= num) - x = 0; - - return x; -} - static unsigned int fanout_demux_hash(struct packet_fanout *f, struct sk_buff *skb, unsigned int num) @@ -1276,13 +1266,9 @@ static unsigned int fanout_demux_lb(struct packet_fanout *f, struct sk_buff *skb, unsigned int num) { - int cur, old; + unsigned int val = atomic_inc_return(&f->rr_cur); - cur = atomic_read(&f->rr_cur); - while ((old = atomic_cmpxchg(&f->rr_cur, cur, - fanout_rr_next(f, num))) != cur) - cur = old; - return cur; + return val % num; } static unsigned int fanout_demux_cpu(struct packet_fanout *f, |