lkml.org 
[lkml]   [2021]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.13 031/219] igc: Check if num of q_vectors is smaller than max before array access
    Date
    From: Sasha Neftin <sasha.neftin@intel.com>

    [ Upstream commit 373e2829e7c2e1e606503cdb5c97749f512a4be9 ]

    Ensure that the adapter->q_vector[MAX_Q_VECTORS] array isn't accessed
    beyond its size. It was fixed by using a local variable num_q_vectors
    as a limit for loop index, and ensure that num_q_vectors is not bigger
    than MAX_Q_VECTORS.

    Suggested-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
    Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
    Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/intel/igc/igc_main.c | 9 ++++++++-
    1 file changed, 8 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
    index 9b85fdf01297..3e301c5c5270 100644
    --- a/drivers/net/ethernet/intel/igc/igc_main.c
    +++ b/drivers/net/ethernet/intel/igc/igc_main.c
    @@ -4402,6 +4402,7 @@ static irqreturn_t igc_msix_ring(int irq, void *data)
    */
    static int igc_request_msix(struct igc_adapter *adapter)
    {
    + unsigned int num_q_vectors = adapter->num_q_vectors;
    int i = 0, err = 0, vector = 0, free_vector = 0;
    struct net_device *netdev = adapter->netdev;

    @@ -4410,7 +4411,13 @@ static int igc_request_msix(struct igc_adapter *adapter)
    if (err)
    goto err_out;

    - for (i = 0; i < adapter->num_q_vectors; i++) {
    + if (num_q_vectors > MAX_Q_VECTORS) {
    + num_q_vectors = MAX_Q_VECTORS;
    + dev_warn(&adapter->pdev->dev,
    + "The number of queue vectors (%d) is higher than max allowed (%d)\n",
    + adapter->num_q_vectors, MAX_Q_VECTORS);
    + }
    + for (i = 0; i < num_q_vectors; i++) {
    struct igc_q_vector *q_vector = adapter->q_vector[i];

    vector++;
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-09-09 14:16    [W:4.343 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site