From mboxrd@z Thu Jan 1 00:00:00 1970 From: Russell King - ARM Linux Subject: Re: [PATCH v2 2/8] phy: mvebu-cp110-comphy: fix port check in ->xlate() Date: Fri, 30 Nov 2018 19:00:31 +0000 Message-ID: <20181130190031.GH30658@n2100.armlinux.org.uk> References: <20181130144743.675-1-miquel.raynal@bootlin.com> <20181130144743.675-3-miquel.raynal@bootlin.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20181130144743.675-3-miquel.raynal@bootlin.com> Sender: linux-kernel-owner@vger.kernel.org To: Miquel Raynal Cc: Gregory Clement , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Kishon Vijay Abraham I , Mark Rutland , devicetree@vger.kernel.org, Antoine Tenart , Grzegorz Jaszczyk , linux-kernel@vger.kernel.org, Maxime Chevallier , Nadav Haklai , Rob Herring , Thomas Petazzoni , Marcin Wojtas , linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org On Fri, Nov 30, 2018 at 03:47:37PM +0100, Miquel Raynal wrote: > So far the PHY ->xlate() callback was checking if the port was > "invalid" before continuing, meaning that the port has not been used > yet. This check is not correct as there is no opposite call to > ->xlate() once the PHY is released by the user and the port will > remain "valid" after the first phy_get()/phy_put() calls. Hence, if > this driver is built as a module, inserted, removed and inserted > again, the PHY will appear busy and the second probe will fail. > > To fix this, just drop the faulty check and instead verify that the > port number is valid (ie. in the possible range). > > Signed-off-by: Miquel Raynal > --- > drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/phy/marvell/phy-mvebu-cp110-comphy.c b/drivers/phy/marvell/phy-mvebu-cp110-comphy.c > index 31b9a1c18345..a40b876ff214 100644 > --- a/drivers/phy/marvell/phy-mvebu-cp110-comphy.c > +++ b/drivers/phy/marvell/phy-mvebu-cp110-comphy.c > @@ -567,9 +567,9 @@ static struct phy *mvebu_comphy_xlate(struct device *dev, > return phy; > > lane = phy_get_drvdata(phy); > - if (lane->port >= 0) > - return ERR_PTR(-EBUSY); > lane->port = args->args[0]; > + if (lane->port >= MVEBU_COMPHY_PORTS) > + return ERR_PTR(-EINVAL); Shouldn't we validate args->args[0] before doing anything? -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up According to speedtest.net: 11.9Mbps down 500kbps up