tuntap: fix dividing by zero in ebpf queue selection
authorJason Wang <jasowang@redhat.com>
Thu, 9 May 2019 03:20:17 +0000 (23:20 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 9 May 2019 16:21:42 +0000 (09:21 -0700)
We need check if tun->numqueues is zero (e.g for the persist device)
before trying to use it for modular arithmetic.

Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
Fixes: 96f84061620c6("tun: add eBPF based queue selection method")
Signed-off-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/tun.c

index 9d72f8c76c158322cb54f67d8adefb6343a9283a..a52bd47e7aa20b63606106635335681d2bad9686 100644 (file)
@@ -596,13 +596,18 @@ static u16 tun_automq_select_queue(struct tun_struct *tun, struct sk_buff *skb)
 static u16 tun_ebpf_select_queue(struct tun_struct *tun, struct sk_buff *skb)
 {
        struct tun_prog *prog;
+       u32 numqueues;
        u16 ret = 0;
 
+       numqueues = READ_ONCE(tun->numqueues);
+       if (!numqueues)
+               return 0;
+
        prog = rcu_dereference(tun->steering_prog);
        if (prog)
                ret = bpf_prog_run_clear_cb(prog->prog, skb);
 
-       return ret % tun->numqueues;
+       return ret % numqueues;
 }
 
 static u16 tun_select_queue(struct net_device *dev, struct sk_buff *skb,