* [Intel-wired-lan] [PATCH v1 1/1] igc: Check if num of q_vectors is smaller than max before array access
@ 2021-06-14 12:19 Sasha Neftin
2021-06-21 12:36 ` Fuxbrumer, Dvora
0 siblings, 1 reply; 2+ messages in thread
From: Sasha Neftin @ 2021-06-14 12:19 UTC (permalink / raw)
To: intel-wired-lan
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>
---
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 ff3c7bc1f0ef..be0d5baf77b7 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -4817,6 +4817,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;
@@ -4825,7 +4826,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.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Intel-wired-lan] [PATCH v1 1/1] igc: Check if num of q_vectors is smaller than max before array access
2021-06-14 12:19 [Intel-wired-lan] [PATCH v1 1/1] igc: Check if num of q_vectors is smaller than max before array access Sasha Neftin
@ 2021-06-21 12:36 ` Fuxbrumer, Dvora
0 siblings, 0 replies; 2+ messages in thread
From: Fuxbrumer, Dvora @ 2021-06-21 12:36 UTC (permalink / raw)
To: intel-wired-lan
On 6/14/2021 15:19, Sasha Neftin wrote:
> 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>
> ---
> drivers/net/ethernet/intel/igc/igc_main.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-21 12:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-14 12:19 [Intel-wired-lan] [PATCH v1 1/1] igc: Check if num of q_vectors is smaller than max before array access Sasha Neftin
2021-06-21 12:36 ` Fuxbrumer, Dvora
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.