* [PATCH] sky2: Make hw->ports the number of ports allocated
@ 2009-09-12 3:19 Mike McCormack
2009-09-12 4:43 ` Stephen Hemminger
0 siblings, 1 reply; 2+ messages in thread
From: Mike McCormack @ 2009-09-12 3:19 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev
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);
--
1.5.6.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] sky2: Make hw->ports the number of ports allocated
2009-09-12 3:19 [PATCH] sky2: Make hw->ports the number of ports allocated Mike McCormack
@ 2009-09-12 4:43 ` Stephen Hemminger
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Hemminger @ 2009-09-12 4:43 UTC (permalink / raw)
To: Mike McCormack; +Cc: netdev
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.
--
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-09-12 4:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-12 3:19 [PATCH] sky2: Make hw->ports the number of ports allocated Mike McCormack
2009-09-12 4:43 ` Stephen Hemminger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).