From: Julia Lawall <[EMAIL PROTECTED]> pci_get_slot does a pci_dev_get, so pci_dev_put needs to be called in an error case
The problem was fixed using the following semantic patch. (http://www.emn.fr/x-info/coccinelle/) // <smpl> @exists@ type T1,T2; identifier E; statement S,S1; expression x1,x2,x3; expression test; int ret != 0; @@ struct pci_dev *E; ... ( E = \(pci_get_slot\|pci_get_device\|pci_get_bus_and_slot\)(...); if (E == NULL) S | if ((E = \(pci_get_slot\|pci_get_device\|pci_get_bus_and_slot\)(...)) == NULL) S ) ... when != pci_dev_put(...,(T1)E,...) when != if (E != NULL) { ... pci_dev_put(...,(T1)E,...); ...} when != x1 = (T1)E when != E = x3; when any ( if (E == NULL) S1 | if (test) + { ( + pci_dev_put(E); return; | + pci_dev_put(E); return ret; ) + } | if (test) { ... when != pci_dev_put(...,(T2)E,...) when != if (E != NULL) { ... pci_dev_put(...,(T2)E,...); ...} when != x2 = (T2)E ( + pci_dev_put(E); return; | + pci_dev_put(E); return ret; ) } ) // </smpl> Signed-off-by: Julia Lawall <[EMAIL PROTECTED]> --- diff -u -p a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c --- a/drivers/char/agp/amd64-agp.c 2007-11-01 10:30:39.000000000 +0100 +++ b/drivers/char/agp/amd64-agp.c 2008-01-04 13:59:45.000000000 +0100 @@ -422,6 +422,7 @@ static int __devinit uli_agp_init(struct if (i == ARRAY_SIZE(uli_sizes)) { printk(KERN_INFO PFX "No ULi size found for %d\n", size); + pci_dev_put(dev1); return -ENODEV; } @@ -429,8 +430,10 @@ static int __devinit uli_agp_init(struct pci_read_config_dword (k8_northbridges[0], AMD64_GARTAPERTUREBASE, &httfea); /* if x86-64 aperture base is beyond 4G, exit here */ - if ((httfea & 0x7fff) >> (32 - 25)) + if ((httfea & 0x7fff) >> (32 - 25)) { + pci_dev_put(dev1); return -ENODEV; + } httfea = (httfea& 0x7fff) << 25; @@ -482,6 +485,7 @@ static int nforce3_agp_init(struct pci_d if (i == ARRAY_SIZE(nforce3_sizes)) { printk(KERN_INFO PFX "No NForce3 size found for %d\n", size); + pci_dev_put(dev1); return -ENODEV; } @@ -496,6 +500,7 @@ static int nforce3_agp_init(struct pci_d /* if x86-64 aperture base is beyond 4G, exit here */ if ( (apbase & 0x7fff) >> (32 - 25) ) { printk(KERN_INFO PFX "aperture base > 4G\n"); + pci_dev_put(dev1); return -ENODEV; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
