Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932179AbbDMLfK (ORCPT ); Mon, 13 Apr 2015 07:35:10 -0400 Received: from mail-lb0-f170.google.com ([209.85.217.170]:36147 "EHLO mail-lb0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932084AbbDMLfH (ORCPT ); Mon, 13 Apr 2015 07:35:07 -0400 MIME-Version: 1.0 In-Reply-To: <1428923713-2419-2-git-send-email-pure.logic@nexus-software.ie> References: <1428923713-2419-1-git-send-email-pure.logic@nexus-software.ie> <1428923713-2419-2-git-send-email-pure.logic@nexus-software.ie> Date: Mon, 13 Apr 2015 14:35:05 +0300 Message-ID: Subject: Re: [PATCH 1/1] stmmac: bugfix oops on rmmod after ifconfig From: Andy Shevchenko To: "Bryan O'Donoghue" Cc: peppe.cavallaro@st.com, netdev , "David S. Miller" , Andy Shevchenko , Kweh Hock Leong , "Ong, Boon Leong" , dan.odonovan@emutex.com, "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2417 Lines: 66 On Mon, Apr 13, 2015 at 2:15 PM, Bryan O'Donoghue wrote: > An oops exists in the flow of stmmac_release(). > phy_ethtool_get_wol() depends on phydev->drv which will be null in > stmmac_dvr_remove after stmmac_mdio_unreg() completes. > > Steps to reproduce on Quark X1000: > > 1. ifconfig eth0 192.168.0.1 > 2. rmmod stmmac_pci > > This patch re-orders the calling of the unreg() functions so that > stmmac_unreg_mdio() happens later in the release() routine thus avoiding the > null pointer dereference. > > Signed-off-by: Bryan O'Donoghue > Reported-by: Dan O'Donovan Shouldn't Fixes: tag be present here? > > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > index a0ea84f..3ab3e4a8 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > @@ -2958,14 +2958,14 @@ int stmmac_dvr_remove(struct net_device *ndev) > priv->hw->dma->stop_tx(priv->ioaddr); > > stmmac_set_mac(priv->ioaddr, false); > - if (priv->pcs != STMMAC_PCS_RGMII && priv->pcs != STMMAC_PCS_TBI && > - priv->pcs != STMMAC_PCS_RTBI) > - stmmac_mdio_unregister(ndev); > netif_carrier_off(ndev); > unregister_netdev(ndev); > if (priv->stmmac_rst) > reset_control_assert(priv->stmmac_rst); > clk_disable_unprepare(priv->stmmac_clk); > + if (priv->pcs != STMMAC_PCS_RGMII && priv->pcs != STMMAC_PCS_TBI && > + priv->pcs != STMMAC_PCS_RTBI) > + stmmac_mdio_unregister(ndev); > free_netdev(ndev); > > return 0; > -- > 1.9.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- With Best Regards, Andy Shevchenko -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/