xsk: proper queue id check at bind

Validate the queue id against both Rx and Tx on the netdev. Also, make
sure that the queue exists at xmit time.

Reported-by: Jesper Dangaard Brouer <brouer@redhat.com>
Tested-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

1 files changed, 7 insertions, 1 deletions

diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
index cb1acd7009f4..29707354cf78 100644
--- a/net/xdp/xsk.c
+++ b/net/xdp/xsk.c
@@ -142,6 +142,11 @@ static int xsk_generic_xmit(struct sock *sk, struct msghdr *m,
                         goto out;
                 }
 
+                if (xs->queue_id >= xs->dev->real_num_tx_queues) {
+                        err = -ENXIO;
+                        goto out;
+                }
+
                 skb = sock_alloc_send_skb(sk, len, !need_wait, &err);
                 if (unlikely(!skb)) {
                         err = -EAGAIN;
@@ -305,7 +310,8 @@ static int xsk_bind(struct socket *sock, struct sockaddr *addr, int addr_len)
                 goto out_unlock;
         }
 
-        if (sxdp->sxdp_queue_id >= dev->num_rx_queues) {
+        if ((xs->rx && sxdp->sxdp_queue_id >= dev->real_num_rx_queues) ||
+            (xs->tx && sxdp->sxdp_queue_id >= dev->real_num_tx_queues)) {
                 err = -EINVAL;
                 goto out_unlock;
         }