[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20090911214358.7096f544@nehalam>
Date: Fri, 11 Sep 2009 21:43:58 -0700
From: Stephen Hemminger <shemminger@...ux-foundation.org>
To: Mike McCormack <mikem@...g3k.org>
Cc: netdev@...r.kernel.org
Subject: Re: [PATCH] sky2: Make hw->ports the number of ports allocated
On Sat, 12 Sep 2009 12:19:23 +0900
Mike McCormack <mikem@...g3k.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@...g3k.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.
--
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists