* [patch] net: mv643xx_eth: potential NULL dereference in probe()
@ 2013-11-13 7:52 Dan Carpenter
2013-11-13 8:24 ` Sebastian Hesselbarth
2013-11-14 8:12 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Dan Carpenter @ 2013-11-13 7:52 UTC (permalink / raw)
To: Sebastian Hesselbarth, Jason Gunthorpe; +Cc: netdev, kernel-janitors
We assume that "mp->phy" can be NULL a couple lines before the
dereference.
Fixes: 1cce16d37d0f ('net: mv643xx_eth: Add missing phy_addr_set in DT mode')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 00cd36e..e7905d9 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -2890,7 +2890,8 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
PHY_INTERFACE_MODE_GMII);
if (!mp->phy)
err = -ENODEV;
- phy_addr_set(mp, mp->phy->addr);
+ else
+ phy_addr_set(mp, mp->phy->addr);
} else if (pd->phy_addr != MV643XX_ETH_PHY_NONE) {
mp->phy = phy_scan(mp, pd->phy_addr);
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [patch] net: mv643xx_eth: potential NULL dereference in probe()
2013-11-13 7:52 [patch] net: mv643xx_eth: potential NULL dereference in probe() Dan Carpenter
@ 2013-11-13 8:24 ` Sebastian Hesselbarth
2013-11-13 18:00 ` Jason Gunthorpe
2013-11-14 8:12 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Sebastian Hesselbarth @ 2013-11-13 8:24 UTC (permalink / raw)
To: Dan Carpenter, Jason Gunthorpe; +Cc: netdev, kernel-janitors
On 11/13/13 08:52, Dan Carpenter wrote:
> We assume that "mp->phy" can be NULL a couple lines before the
> dereference.
>
> Fixes: 1cce16d37d0f ('net: mv643xx_eth: Add missing phy_addr_set in DT mode')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
> index 00cd36e..e7905d9 100644
> --- a/drivers/net/ethernet/marvell/mv643xx_eth.c
> +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
> @@ -2890,7 +2890,8 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
> PHY_INTERFACE_MODE_GMII);
> if (!mp->phy)
> err = -ENODEV;
> - phy_addr_set(mp, mp->phy->addr);
> + else
> + phy_addr_set(mp, mp->phy->addr);
> } else if (pd->phy_addr != MV643XX_ETH_PHY_NONE) {
> mp->phy = phy_scan(mp, pd->phy_addr);
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [patch] net: mv643xx_eth: potential NULL dereference in probe()
2013-11-13 8:24 ` Sebastian Hesselbarth
@ 2013-11-13 18:00 ` Jason Gunthorpe
0 siblings, 0 replies; 4+ messages in thread
From: Jason Gunthorpe @ 2013-11-13 18:00 UTC (permalink / raw)
To: Sebastian Hesselbarth; +Cc: Dan Carpenter, netdev, kernel-janitors
On Wed, Nov 13, 2013 at 09:24:20AM +0100, Sebastian Hesselbarth wrote:
> On 11/13/13 08:52, Dan Carpenter wrote:
> >We assume that "mp->phy" can be NULL a couple lines before the
> >dereference.
> >
> >Fixes: 1cce16d37d0f ('net: mv643xx_eth: Add missing phy_addr_set in DT mode')
> >Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
My bad, I missed this possibility.
Jason
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch] net: mv643xx_eth: potential NULL dereference in probe()
2013-11-13 7:52 [patch] net: mv643xx_eth: potential NULL dereference in probe() Dan Carpenter
2013-11-13 8:24 ` Sebastian Hesselbarth
@ 2013-11-14 8:12 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2013-11-14 8:12 UTC (permalink / raw)
To: dan.carpenter; +Cc: sebastian.hesselbarth, jgunthorpe, netdev, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 13 Nov 2013 10:52:47 +0300
> We assume that "mp->phy" can be NULL a couple lines before the
> dereference.
>
> Fixes: 1cce16d37d0f ('net: mv643xx_eth: Add missing phy_addr_set in DT mode')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-11-14 8:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-13 7:52 [patch] net: mv643xx_eth: potential NULL dereference in probe() Dan Carpenter
2013-11-13 8:24 ` Sebastian Hesselbarth
2013-11-13 18:00 ` Jason Gunthorpe
2013-11-14 8:12 ` David Miller
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).