]> git.baikalelectronics.ru Git - kernel.git/commit
e1000e: Modify Tx/Rx configurations to avoid null pointer dereferences in e1000_open
authorJia-Ju Bai <baijiaju1990@163.com>
Wed, 5 Aug 2015 10:16:10 +0000 (18:16 +0800)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 18 Aug 2015 21:06:06 +0000 (14:06 -0700)
commita5ac0226585799e89c2bfdb46f6ad5aface6b463
tree4cefdd69e0cb00173546180b57d6714cfc3ab775
parent8d5239bcb5696ffd8ffe259e388a8aafc9152b37
e1000e: Modify Tx/Rx configurations to avoid null pointer dereferences in e1000_open

When e1000e_setup_rx_resources is failed in e1000_open,
e1000e_free_tx_resources in "err_setup_rx" segment is executed.
"writel(0, tx_ring->head)" statement in e1000_clean_tx_ring
in e1000e_free_tx_resources will cause a null poonter dereference(crash),
because "tx_ring->head" is only assigned in e1000_configure_tx
in e1000_configure, but it is after e1000e_setup_rx_resources.

This patch moves head/tail register writing to e1000_configure_tx/rx,
which can fix this problem. It is inspired by igb_configure_tx_ring
in the igb driver.

Specially, thank Alexander Duyck for his valuable suggestion.

Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/e1000e/netdev.c