* [PATCH] e1000: ethtool: check on netif_running() before calling e1000_up()
@ 2018-07-18 19:18 Bo Chen
2018-07-18 20:49 ` Alexander Duyck
0 siblings, 1 reply; 2+ messages in thread
From: Bo Chen @ 2018-07-18 19:18 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: davem, netdev, linux-kernel, phenix1108, Bo Chen
When the device is not up, the call to 'e1000_up()' from the error handling path
of 'e1000_set_ringparam()' causes a kernel oops with a null-pointer
dereference. The null-pointer dereference is triggered in function
'e1000_alloc_rx_buffers()' at line 'buffer_info = &rx_ring->buffer_info[i]'.
This bug was reported by COD, a tool for testing kernel module binaries I am
building. This bug was also detected by KFI from Dr. Kai Cong.
This patch fixes the bug by checking on 'netif_running()' before calling
'e1000_up()' in 'e1000_set_ringparam()'.
Signed-off-by: Bo Chen <chenbo@pdx.edu>
---
drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
index bdb3f8e65ed4..c1e4e94f100f 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
@@ -644,7 +644,8 @@ static int e1000_set_ringparam(struct net_device *netdev,
err_alloc_rx:
kfree(txdr);
err_alloc_tx:
- e1000_up(adapter);
+ if (netif_running(adapter->netdev))
+ e1000_up(adapter);
err_setup:
clear_bit(__E1000_RESETTING, &adapter->flags);
return err;
--
2.17.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] e1000: ethtool: check on netif_running() before calling e1000_up()
2018-07-18 19:18 [PATCH] e1000: ethtool: check on netif_running() before calling e1000_up() Bo Chen
@ 2018-07-18 20:49 ` Alexander Duyck
0 siblings, 0 replies; 2+ messages in thread
From: Alexander Duyck @ 2018-07-18 20:49 UTC (permalink / raw)
To: Bo Chen
Cc: Jeff Kirsher, David Miller, Netdev, LKML, phenix1108, intel-wired-lan
On Wed, Jul 18, 2018 at 12:18 PM, Bo Chen <chenbo@pdx.edu> wrote:
> When the device is not up, the call to 'e1000_up()' from the error handling path
> of 'e1000_set_ringparam()' causes a kernel oops with a null-pointer
> dereference. The null-pointer dereference is triggered in function
> 'e1000_alloc_rx_buffers()' at line 'buffer_info = &rx_ring->buffer_info[i]'.
>
> This bug was reported by COD, a tool for testing kernel module binaries I am
> building. This bug was also detected by KFI from Dr. Kai Cong.
>
> This patch fixes the bug by checking on 'netif_running()' before calling
> 'e1000_up()' in 'e1000_set_ringparam()'.
>
> Signed-off-by: Bo Chen <chenbo@pdx.edu>
The change below looks good to me.
Acked-by: Alexander Duyck <alexander.h.duyck@intel.com>
> ---
> drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
> index bdb3f8e65ed4..c1e4e94f100f 100644
> --- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
> +++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
> @@ -644,7 +644,8 @@ static int e1000_set_ringparam(struct net_device *netdev,
> err_alloc_rx:
> kfree(txdr);
> err_alloc_tx:
> - e1000_up(adapter);
> + if (netif_running(adapter->netdev))
> + e1000_up(adapter);
> err_setup:
> clear_bit(__E1000_RESETTING, &adapter->flags);
> return err;
> --
> 2.17.0
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-07-18 20:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-18 19:18 [PATCH] e1000: ethtool: check on netif_running() before calling e1000_up() Bo Chen
2018-07-18 20:49 ` Alexander Duyck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).