diff mbox series

[U-Boot,v3,4/7] net: mvpp2: no deref null

Message ID 20190806155144.19301-5-nhed+uboot@starry.com
State New, archived
Delegated to: Joe Hershberger
Headers show
Series Switch MVPP2 to use new MVMDIO | expand

Commit Message

Nevo Hed Aug. 6, 2019, 3:51 p.m. UTC 
From: Nevo Hed <nhed+github@starry.com>

phy_dev ptr is set from return of phy_connect() and is used before
test to see if NULL.  Obviously since the test already sxists someone
made the determination that this NULL is possible.

Signed-off-by: Nevo Hed <nhed+github@starry.com>
---
 drivers/net/mvpp2.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Ramon Fried Aug. 7, 2019, 2:57 p.m. UTC | #1 
On Tue, Aug 6, 2019 at 6:52 PM <nhed+uboot@starry.com> wrote:
>
> From: Nevo Hed <nhed+github@starry.com>
>
> phy_dev ptr is set from return of phy_connect() and is used before
> test to see if NULL.  Obviously since the test already sxists someone
> made the determination that this NULL is possible.
>
> Signed-off-by: Nevo Hed <nhed+github@starry.com>
> ---
>  drivers/net/mvpp2.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c
> index fae7090121..5f908113f2 100644
> --- a/drivers/net/mvpp2.c
> +++ b/drivers/net/mvpp2.c
> @@ -4494,7 +4494,8 @@ static void mvpp2_phy_connect(struct udevice *dev, struct mvpp2_port *port)
>                  * an option because it is required for the phy_fw_down
>                  * procedure.
>                  */
> -               if (phy_dev->drv->uid == 0xffffffff) {/* Generic phy */
> +               if (phy_dev &&
> +                   phy_dev->drv->uid == 0xffffffff) {/* Generic phy */
>                         netdev_warn(port->dev,
>                                     "Marking phy as invalid, link will not be checked\n");
>                         /* set phy_addr to invalid value */
> --
> 2.21.0
>
Reviewed-By: Ramon Fried <rfried.dev@gmail.com>
diff mbox series

Patch

diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c
index fae7090121..5f908113f2 100644
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -4494,7 +4494,8 @@  static void mvpp2_phy_connect(struct udevice *dev, struct mvpp2_port *port)
 		 * an option because it is required for the phy_fw_down
 		 * procedure.
 		 */
-		if (phy_dev->drv->uid == 0xffffffff) {/* Generic phy */
+		if (phy_dev &&
+		    phy_dev->drv->uid == 0xffffffff) {/* Generic phy */
 			netdev_warn(port->dev,
 				    "Marking phy as invalid, link will not be checked\n");
 			/* set phy_addr to invalid value */