[PATCH net-next] rocker: gaurd against NULL rocker_port when removing ports

[PATCH net-next] rocker: gaurd against NULL rocker_port when removing ports

[sfeldma]

From: Scott Feldman <sfeldma@gmail.com>

The ports array is filled in as ports are probed, but if probing doesn't
finish, we need to stop only those ports that where probed successfully.
Check the ports array for NULL to skip un-probed ports when stopping.

Signed-off-by: Scott Feldman <sfeldma@gmail.com>
---
 drivers/net/ethernet/rocker/rocker.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index 819289e..c6a6e3c 100644
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -4802,6 +4802,8 @@ static void rocker_remove_ports(const struct rocker *rocker)
 
 	for (i = 0; i < rocker->port_count; i++) {
 		rocker_port = rocker->ports[i];
+		if (!rocker_port)
+			continue;
 		rocker_port_ig_tbl(rocker_port, SWITCHDEV_TRANS_NONE,
 				   ROCKER_OP_FLAG_REMOVE);
 		unregister_netdev(rocker_port->dev);
-- 
1.7.10.4

Re: [PATCH net-next] rocker: gaurd against NULL rocker_port when removing ports

[Jiri Pirko]

Sat, Jun 13, 2015 at 06:09:44AM CEST, sfeldma@gmail.com wrote:
>From: Scott Feldman <sfeldma@gmail.com>
>
>The ports array is filled in as ports are probed, but if probing doesn't
>finish, we need to stop only those ports that where probed successfully.
>Check the ports array for NULL to skip un-probed ports when stopping.
>
>Signed-off-by: Scott Feldman <sfeldma@gmail.com>

Acked-by: Jiri Pirko <jiri@resnulli.us>

Re: [PATCH net-next] rocker: gaurd against NULL rocker_port when removing ports

[David Miller]

From: sfeldma@gmail.com
Date: Fri, 12 Jun 2015 21:09:44 -0700

> From: Scott Feldman <sfeldma@gmail.com>
> 
> The ports array is filled in as ports are probed, but if probing doesn't
> finish, we need to stop only those ports that where probed successfully.
> Check the ports array for NULL to skip un-probed ports when stopping.
> 
> Signed-off-by: Scott Feldman <sfeldma@gmail.com>

Applied.