diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-06-26 18:47:29 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2016-06-26 18:47:29 +0200 |
| commit | 459a8afff1d5448f399ab9f6844ec79f67d6f102 (patch) | |
| tree | bae5307015d3765d9d9434d6ec22e4624c2d9e25 /target/linux/generic/patches-3.18 | |
| parent | bf32177a1df123aa9b33c105d8895c81be81167a (diff) | |
| download | upstream-459a8afff1d5448f399ab9f6844ec79f67d6f102.tar.gz upstream-459a8afff1d5448f399ab9f6844ec79f67d6f102.tar.bz2 upstream-459a8afff1d5448f399ab9f6844ec79f67d6f102.zip | |
kernel: remove igb: Fix Null-pointer dereference patch
This patch is already included in the Linux mainline kernel since
v3.15, remove it from LEDE, see the lines directly before this patch.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/patches-3.18')
| -rw-r--r-- | target/linux/generic/patches-3.18/780-igb-Fix-Null-pointer-dereference-in-igb_reset_q_vect.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/target/linux/generic/patches-3.18/780-igb-Fix-Null-pointer-dereference-in-igb_reset_q_vect.patch b/target/linux/generic/patches-3.18/780-igb-Fix-Null-pointer-dereference-in-igb_reset_q_vect.patch deleted file mode 100644 index e541b2c264..0000000000 --- a/target/linux/generic/patches-3.18/780-igb-Fix-Null-pointer-dereference-in-igb_reset_q_vect.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 -@@ -1034,6 +1034,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; - |