lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 769/849] gve: Fix off by one in gve_tx_timeout()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit 1c360cc1cc883fbdf0a258b4df376571fbeac5ee ]

    The priv->ntfy_blocks[] has "priv->num_ntfy_blks" elements so this >
    needs to be >= to prevent an off by one bug. The priv->ntfy_blocks[]
    array is allocated in gve_alloc_notify_blocks().

    Fixes: 87a7f321bb6a ("gve: Recover from queue stall due to missed IRQ")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/google/gve/gve_main.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c
    index 8c996e72748d2..959352fceead7 100644
    --- a/drivers/net/ethernet/google/gve/gve_main.c
    +++ b/drivers/net/ethernet/google/gve/gve_main.c
    @@ -1132,7 +1132,7 @@ static void gve_tx_timeout(struct net_device *dev, unsigned int txqueue)
    goto reset;

    ntfy_idx = gve_tx_idx_to_ntfy(priv, txqueue);
    - if (ntfy_idx > priv->num_ntfy_blks)
    + if (ntfy_idx >= priv->num_ntfy_blks)
    goto reset;

    block = &priv->ntfy_blocks[ntfy_idx];
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 00:23    [W:2.665 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site