ice: Add a boundary check in ice_xsk_umem()

In ice_xsk_umem(), variable qid which is later used as an array index,
is not validated for a possible boundary exceedance. Because of that,
a calling function might receive an invalid address, which causes
general protection fault when dereferenced.

To address this, add a boundary check to see if qid is greater than the
size of a UMEM array. Also, don't let user change vsi->num_xsk_umems
just by trying to setup a second UMEM if its value is already set up
(i.e. UMEM region has already been allocated for this VSI).

While at it, make sure that ring->zca.free pointer is always zeroed out
if there is no UMEM on a specified ring.

Signed-off-by: Krzysztof Kazimierczak <krzysztof.kazimierczak@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
index 1376219a6c7e1142140f347e966d484e7614a9aa..cb10abb14e11c7749127ca7e1356fe3e719992d6 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@ -465,12 +465,13 @@ static inline void ice_set_ring_xdp(struct ice_ring *ring)
 static inline struct xdp_umem *ice_xsk_umem(struct ice_ring *ring)
 {
        struct xdp_umem **umems = ring->vsi->xsk_umems;
-       int qid = ring->q_index;
+       u16 qid = ring->q_index;
 
        if (ice_ring_is_xdp(ring))
                qid -= ring->vsi->num_xdp_txq;
 
-       if (!umems || !umems[qid] || !ice_is_xdp_ena_vsi(ring->vsi))
+       if (qid >= ring->vsi->num_xsk_umems || !umems || !umems[qid] ||
+           !ice_is_xdp_ena_vsi(ring->vsi))
                return NULL;
 
        return umems[qid];

diff --git a/drivers/net/ethernet/intel/ice/ice_base.c b/drivers/net/ethernet/intel/ice/ice_base.c
index d4559d45288f50fc3a063bb5ce5ca3573c17ee00..25f2e0fb38333bfa7ba48c3de9801e89da8d8eed 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_base.c
+++ b/drivers/net/ethernet/intel/ice/ice_base.c
@@ -326,6 +326,7 @@ int ice_setup_rx_ctx(struct ice_ring *ring)
                        dev_info(&vsi->back->pdev->dev, "Registered XDP mem model MEM_TYPE_ZERO_COPY on Rx ring %d\n",
                                 ring->q_index);
                } else {
+                       ring->zca.free = NULL;
                        if (!xdp_rxq_info_is_reg(&ring->xdp_rxq))
                                xdp_rxq_info_reg(&ring->xdp_rxq,
                                                 ring->netdev,

diff --git a/drivers/net/ethernet/intel/ice/ice_xsk.c b/drivers/net/ethernet/intel/ice/ice_xsk.c
index 0af1f0b951c0e2b0b92b8ec980b8fe556cb848aa..0e401f116d54f9fec6dfac5abff9953fa8469af0 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_xsk.c
+++ b/drivers/net/ethernet/intel/ice/ice_xsk.c
@@ -414,7 +414,8 @@ ice_xsk_umem_enable(struct ice_vsi *vsi, struct xdp_umem *umem, u16 qid)
        if (vsi->type != ICE_VSI_PF)
                return -EINVAL;
 
-       vsi->num_xsk_umems = min_t(u16, vsi->num_rxq, vsi->num_txq);
+       if (!vsi->num_xsk_umems)
+               vsi->num_xsk_umems = min_t(u16, vsi->num_rxq, vsi->num_txq);
        if (qid >= vsi->num_xsk_umems)
                return -EINVAL;