diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-12-02 22:23:22 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-12-02 22:23:22 +0000 |
commit | 621677154f39f2e0b698a558b8b795db84a8e014 (patch) | |
tree | 3c4d60241f9ad7f52f12aa022af8b5a684b2ab08 /target/linux/generic/patches-4.4/780-igb-Fix-Null-pointer-dereference-in-igb_reset_q_vect.patch | |
parent | 4454a3fb6375cf1adf17f63a54cd7660bc40caa7 (diff) | |
download | master-31e0f0ae-621677154f39f2e0b698a558b8b795db84a8e014.tar.gz master-31e0f0ae-621677154f39f2e0b698a558b8b795db84a8e014.tar.bz2 master-31e0f0ae-621677154f39f2e0b698a558b8b795db84a8e014.zip |
kernel: add linux 4.4 support
Based on 4.4-rc3. Runtime tested on MIPS.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 47701
Diffstat (limited to 'target/linux/generic/patches-4.4/780-igb-Fix-Null-pointer-dereference-in-igb_reset_q_vect.patch')
-rw-r--r-- | target/linux/generic/patches-4.4/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-4.4/780-igb-Fix-Null-pointer-dereference-in-igb_reset_q_vect.patch b/target/linux/generic/patches-4.4/780-igb-Fix-Null-pointer-dereference-in-igb_reset_q_vect.patch new file mode 100644 index 0000000000..e541b2c264 --- /dev/null +++ b/target/linux/generic/patches-4.4/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 +@@ -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; + |