octeontx2-af: Fix possible buffer overflow

A loop in rvu_mbox_handler_nix_bandprof_free() contains
a break if (idx == MAX_BANDPROF_PER_PFFUNC),
but if idx may reach MAX_BANDPROF_PER_PFFUNC
buffer '(*req->prof_idx)[layer]' overflow happens before that check.

The patch moves the break to the
beginning of the loop.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: e8e095b3b370 ("octeontx2-af: cn10k: Bandwidth profiles config support").
Signed-off-by: Elena Salomatkina <elena.salomatkina.cmc@gmail.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Subbaraya Sundeep <sbhatta@marvell.com>
Link: https://lore.kernel.org/r/20231124210802.109763-1-elena.salomatkina.cmc@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
index 23c2f2ed2fb83294f4345cf55e9b5252d280b376..c112c71ff576f8a693412ff30b435eb0ee3a193f 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
@@ -5505,6 +5505,8 @@ int rvu_mbox_handler_nix_bandprof_free(struct rvu *rvu,
 
                ipolicer = &nix_hw->ipolicer[layer];
                for (idx = 0; idx < req->prof_count[layer]; idx++) {
+                       if (idx == MAX_BANDPROF_PER_PFFUNC)
+                               break;
                        prof_idx = req->prof_idx[layer][idx];
                        if (prof_idx >= ipolicer->band_prof.max ||
                            ipolicer->pfvf_map[prof_idx] != pcifunc)
@@ -5518,8 +5520,6 @@ int rvu_mbox_handler_nix_bandprof_free(struct rvu *rvu,
                        ipolicer->pfvf_map[prof_idx] = 0x00;
                        ipolicer->match_id[prof_idx] = 0;
                        rvu_free_rsrc(&ipolicer->band_prof, prof_idx);
-                       if (idx == MAX_BANDPROF_PER_PFFUNC)
-                               break;
                }
        }
        mutex_unlock(&rvu->rsrc_lock);