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 88beb0a302181d176eb0ba93bd0e7cc16a629abc..9c8c8a126b02759d126b0c638ca4fe58505165b1 100644 (file)
--- 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 <arno@natisbad.org>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- 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 (file)
index 0000000..25ff158
--- /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 <dan.carpenter@oracle.com>
+Date: Wed, 13 Nov 2013 10:52:47 +0300
+Subject: net: mv643xx_eth: potential NULL dereference in
+ probe()
+
+From: Dan Carpenter <dan.carpenter@oracle.com>
+
+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>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 0325c5c4ab6a9890fc1a0149c7f5a27296ee3716..ef29cfcca4cd5382c7eb8e018beeaa8c7ebe3cd6 100644 (file)
--- 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