2005-02-28 13:54:49

by Panagiotis Issaris

Subject: [PATCH] Possible VIA-Rhine free irq issue

Hi,

It seems to me that in the VIA Rhine device driver the requested irq might
not be freed in case the alloc_ring() function fails. alloc_ring()
can fail with a ENOMEM return value because of possible
pci_alloc_consistent() failures.

This patch applies to 2.6.11-rc5-bk2.

diff -uprN linux-2.6.11-rc5-bk2/drivers/net/via-rhine.c linux-2.6.11-rc5-bk2-pi/drivers/net/via-rhine.c
--- linux-2.6.11-rc5-bk2/drivers/net/via-rhine.c 2005-02-28 13:44:37.000000000 +0100
+++ linux-2.6.11-rc5-bk2-pi/drivers/net/via-rhine.c 2005-02-28 13:44:31.000000000 +0100
@@ -1198,7 +1198,10 @@ static int rhine_open(struct net_device

rc = alloc_ring(dev);
if (rc)
+ {
+ free_irq(rp->pdev->irq, dev);
return rc;
+ }
alloc_rbufs(dev);
alloc_tbufs(dev);
rhine_chip_reset(dev);


With friendly regards,
Takis
--
OpenPGP key: http://lumumba.luc.ac.be/takis/takis_public_key.txt
fingerprint: 6571 13A3 33D9 3726 F728 AA98 F643 B12E ECF3 E029

2005-03-02 06:23:06

by Jeff Garzik

Subject: Re: [PATCH] Possible VIA-Rhine free irq issue

Panagiotis Issaris wrote:
> Hi,
>
> It seems to me that in the VIA Rhine device driver the requested irq might
> not be freed in case the alloc_ring() function fails. alloc_ring()
> can fail with a ENOMEM return value because of possible
> pci_alloc_consistent() failures.
>
> This patch applies to 2.6.11-rc5-bk2.
>
> diff -uprN linux-2.6.11-rc5-bk2/drivers/net/via-rhine.c linux-2.6.11-rc5-bk2-pi/drivers/net/via-rhine.c
> --- linux-2.6.11-rc5-bk2/drivers/net/via-rhine.c 2005-02-28 13:44:37.000000000 +0100
> +++ linux-2.6.11-rc5-bk2-pi/drivers/net/via-rhine.c 2005-02-28 13:44:31.000000000 +0100
> @@ -1198,7 +1198,10 @@ static int rhine_open(struct net_device
>
> rc = alloc_ring(dev);
> if (rc)
> + {
> + free_irq(rp->pdev->irq, dev);
> return rc;
> + }

Yes, this is a needed fix. Thanks,

Jeff