From: Greg Kroah-Hartman Date: Fri, 6 Dec 2013 00:22:15 +0000 (-0800) Subject: 3.12-stable patches X-Git-Tag: v3.4.73~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=882f1e304f9532d93fef6fad7bfd92d620b3d8cd;p=thirdparty%2Fkernel%2Fstable-queue.git 3.12-stable patches added patches: net-mv643xx_eth-potential-null-dereference-in.patch --- diff --git a/queue-3.12/net-mv643xx_eth-add-missing-phy_addr_set-in-dt-mode.patch b/queue-3.12/net-mv643xx_eth-add-missing-phy_addr_set-in-dt-mode.patch index 88beb0a3021..9c8c8a126b0 100644 --- a/queue-3.12/net-mv643xx_eth-add-missing-phy_addr_set-in-dt-mode.patch +++ b/queue-3.12/net-mv643xx_eth-add-missing-phy_addr_set-in-dt-mode.patch @@ -22,14 +22,12 @@ Tested-by: Arnaud Ebalard Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- - drivers/net/ethernet/marvell/mv643xx_eth.c | 1 + + drivers/net/ethernet/marvell/mv643xx_eth.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c -index 2c210ec..00e43b5 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c -@@ -2890,6 +2890,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev) +@@ -2890,6 +2890,7 @@ static int mv643xx_eth_probe(struct plat PHY_INTERFACE_MODE_GMII); if (!mp->phy) err = -ENODEV; @@ -37,7 +35,3 @@ index 2c210ec..00e43b5 100644 } else if (pd->phy_addr != MV643XX_ETH_PHY_NONE) { mp->phy = phy_scan(mp, pd->phy_addr); --- -1.7.11.7 - - diff --git a/queue-3.12/net-mv643xx_eth-potential-null-dereference-in.patch b/queue-3.12/net-mv643xx_eth-potential-null-dereference-in.patch new file mode 100644 index 00000000000..25ff158a1f2 --- /dev/null +++ b/queue-3.12/net-mv643xx_eth-potential-null-dereference-in.patch @@ -0,0 +1,33 @@ +From foo@baz Thu Dec 5 16:16:37 PST 2013 +From: Dan Carpenter +Date: Wed, 13 Nov 2013 10:52:47 +0300 +Subject: net: mv643xx_eth: potential NULL dereference in + probe() + +From: Dan Carpenter + +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 +Acked-by: Sebastian Hesselbarth +Acked-by: Jason Gunthorpe +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/marvell/mv643xx_eth.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- 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 plat + 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); + diff --git a/queue-3.12/series b/queue-3.12/series index 0325c5c4ab6..ef29cfcca4c 100644 --- a/queue-3.12/series +++ b/queue-3.12/series @@ -1 +1,2 @@ net-mv643xx_eth-add-missing-phy_addr_set-in-dt-mode.patch +net-mv643xx_eth-potential-null-dereference-in.patch