diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-08-25 21:50:47 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-08-25 21:50:47 +0000 |
| commit | b13e12819b1c48123d8745d3f420da35a76cf0e1 (patch) | |
| tree | 782c8793136102aef4d163508623abfe6ef24c37 /target | |
| parent | eb75d320d1d65c1960f20f370ae3396fda1c404e (diff) | |
| download | upstream-b13e12819b1c48123d8745d3f420da35a76cf0e1.tar.gz upstream-b13e12819b1c48123d8745d3f420da35a76cf0e1.tar.bz2 upstream-b13e12819b1c48123d8745d3f420da35a76cf0e1.zip | |
kernel: 3.14: backport for igb driver resolving a driver crash
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
SVN-Revision: 42295
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/generic/patches-3.14/780-igb-Fix-Null-pointer-dereference-in-igb_reset_q_vect.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.14/780-igb-Fix-Null-pointer-dereference-in-igb_reset_q_vect.patch b/target/linux/generic/patches-3.14/780-igb-Fix-Null-pointer-dereference-in-igb_reset_q_vect.patch new file mode 100644 index 0000000000..3beb9071e4 --- /dev/null +++ b/target/linux/generic/patches-3.14/780-igb-Fix-Null-pointer-dereference-in-igb_reset_q_vect.patch @@ -0,0 +1,40 @@ +From cb06d102327eadcd1bdc480bfd9f8876251d1007 Mon Sep 17 00:00:00 2001 +From: Christoph Paasch <christoph.paasch@uclouvain.be> +Date: Fri, 21 Mar 2014 03:48:19 -0700 +Subject: [PATCH] igb: Fix Null-pointer dereference in igb_reset_q_vector + +When igb_set_interrupt_capability() calls +igb_reset_interrupt_capability() (e.g., because CONFIG_PCI_MSI is unset), +num_q_vectors has been set but no vector has yet been allocated. + +igb_reset_interrupt_capability() will then call igb_reset_q_vector, +which assumes that the vector is allocated. As this is not the case, we +are accessing a NULL-pointer. + +This patch fixes it by checking that q_vector is indeed different from +NULL. + +Fixes: 02ef6e1d0b0023 (igb: Fix queue allocation method to accommodate changing during runtime) +Cc: Carolyn Wyborny <carolyn.wyborny@intel.com> +Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be> +Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> +Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> +--- + drivers/net/ethernet/intel/igb/igb_main.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/drivers/net/ethernet/intel/igb/igb_main.c ++++ b/drivers/net/ethernet/intel/igb/igb_main.c +@@ -1020,6 +1020,12 @@ static void igb_reset_q_vector(struct ig + if (!q_vector) + return; + ++ /* Coming from igb_set_interrupt_capability, the vectors are not yet ++ * allocated. So, q_vector is NULL so we should stop here. ++ */ ++ if (!q_vector) ++ return; ++ + if (q_vector->tx.ring) + adapter->tx_ring[q_vector->tx.ring->queue_index] = NULL; + |