Commit 373e2829 authored by Sasha Neftin's avatar Sasha Neftin Committed by Tony Nguyen

igc: Check if num of q_vectors is smaller than max before array access

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: default avatarAleksandr Loktionov <aleksandr.loktionov@intel.com>
Signed-off-by: default avatarSasha Neftin <sasha.neftin@intel.com>
Tested-by: default avatarDvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent e0bc64d3
...@@ -5125,6 +5125,7 @@ static irqreturn_t igc_msix_ring(int irq, void *data) ...@@ -5125,6 +5125,7 @@ static irqreturn_t igc_msix_ring(int irq, void *data)
*/ */
static int igc_request_msix(struct igc_adapter *adapter) 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; int i = 0, err = 0, vector = 0, free_vector = 0;
struct net_device *netdev = adapter->netdev; struct net_device *netdev = adapter->netdev;
...@@ -5133,7 +5134,13 @@ static int igc_request_msix(struct igc_adapter *adapter) ...@@ -5133,7 +5134,13 @@ static int igc_request_msix(struct igc_adapter *adapter)
if (err) if (err)
goto err_out; 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]; struct igc_q_vector *q_vector = adapter->q_vector[i];
vector++; vector++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment