Patchwork sky2: Make hw->ports the number of ports allocated

login
register
mail settings
Submitter Mike McCormack
Date Sept. 12, 2009, 3:19 a.m.
Message ID <4AAB133B.8070900@ring3k.org>
Download mbox | patch
Permalink /patch/33518/
State Superseded
Delegated to: David Miller
Headers show

Comments

Mike McCormack - Sept. 12, 2009, 3:19 a.m.
If allocation of the second ports fails, make sure that hw->ports
 is not 2 otherwise we'll crash trying to access the second port.

Signed-off-by: Mike McCormack <mikem@ring3k.org>
---
 drivers/net/sky2.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
Stephen Hemminger - Sept. 12, 2009, 4:43 a.m.
On Sat, 12 Sep 2009 12:19:23 +0900
Mike McCormack <mikem@ring3k.org> wrote:

> If allocation of the second ports fails, make sure that hw->ports
>  is not 2 otherwise we'll crash trying to access the second port.
> 
> Signed-off-by: Mike McCormack <mikem@ring3k.org>
> ---
>  drivers/net/sky2.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
> index 018aa58..c17ee26 100644
> --- a/drivers/net/sky2.c
> +++ b/drivers/net/sky2.c
> @@ -4563,6 +4563,10 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
>  			free_netdev(dev1);
>  		} else
>  			sky2_show_addr(dev1);
> +
> +		/* couldn't allocate the second port */
> +		if (!hw->dev[1])
> +			--hw->ports;
>  	}
>  
>  	setup_timer(&hw->watchdog_timer, sky2_watchdog, (unsigned long) hw);

If it couldn't allocate the port, would be better to unwind the first port
and fail the probe, rather than silently failing in a really sick system.

Patch

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 018aa58..c17ee26 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -4563,6 +4563,10 @@  static int __devinit sky2_probe(struct pci_dev *pdev,
 			free_netdev(dev1);
 		} else
 			sky2_show_addr(dev1);
+
+		/* couldn't allocate the second port */
+		if (!hw->dev[1])
+			--hw->ports;
 	}
 
 	setup_timer(&hw->watchdog_timer, sky2_watchdog, (unsigned long) hw);