ipmi: fix memleaking for add_smi when duplicating happen

[net-next-2.6.git] / drivers / char / ipmi / ipmi_si_intf.c

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 094bdc355b1fe753c003d30277fbf9a038281444..6c2daed531df4a1477d0806f319934e68780133f 100644 (file)
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -1804,9 +1804,12 @@ static int hotmod_handler(const char *val, struct kernel_param *kp)
                                info->irq_setup = std_irq_setup;
                        info->slave_addr = ipmb;
 
-                       if (!add_smi(info))
+                       if (!add_smi(info)) {
                                if (try_smi_init(info))
                                        cleanup_one_si(info);
+                       } else {
+                               kfree(info);
+                       }
                } else {
                        /* remove */
                        struct smi_info *e, *tmp_e;
@@ -1890,9 +1893,12 @@ static __devinit void hardcode_find_bmc(void)
                        info->irq_setup = std_irq_setup;
                info->slave_addr = slave_addrs[i];
 
-               if (!add_smi(info))
+               if (!add_smi(info)) {
                        if (try_smi_init(info))
                                cleanup_one_si(info);
+               } else {
+                       kfree(info);
+               }
        }
 }
 
@@ -1965,8 +1971,8 @@ static int acpi_gpe_irq_setup(struct smi_info *info)
 
 /*
  * Defined at
- * http://h21007.www2.hp.com/dspp/files/unprotected/devresource/
- * Docs/TechPapers/IA64/hpspmi.pdf
+ * http://h21007.www2.hp.com/portal/download/files
+ * /unprot/hpspmi.pdf
  */
 struct SPMITable {
        s8      Signature[4];
@@ -2013,18 +2019,12 @@ struct SPMITable {
 static __devinit int try_init_spmi(struct SPMITable *spmi)
 {
        struct smi_info  *info;
-       u8               addr_space;
 
        if (spmi->IPMIlegacy != 1) {
                printk(KERN_INFO PFX "Bad SPMI legacy %d\n", spmi->IPMIlegacy);
                return -ENODEV;
        }
 
-       if (spmi->addr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
-               addr_space = IPMI_MEM_ADDR_SPACE;
-       else
-               addr_space = IPMI_IO_ADDR_SPACE;
-
        info = kzalloc(sizeof(*info), GFP_KERNEL);
        if (!info) {
                printk(KERN_ERR PFX "Could not allocate SI data (3)\n");
@@ -2088,7 +2088,8 @@ static __devinit int try_init_spmi(struct SPMITable *spmi)
        }
        info->io.addr_data = spmi->addr.address;
 
-       add_smi(info);
+       if (add_smi(info))
+               kfree(info);
 
        return 0;
 }
@@ -2176,6 +2177,14 @@ static int __devinit ipmi_pnp_probe(struct pnp_dev *dev,
        info->io.addr_data = res->start;
 
        info->io.regspacing = DEFAULT_REGSPACING;
+       res = pnp_get_resource(dev,
+                              (info->io.addr_type == IPMI_IO_ADDR_SPACE) ?
+                                       IORESOURCE_IO : IORESOURCE_MEM,
+                              1);
+       if (res) {
+               if (res->start > info->io.addr_data)
+                       info->io.regspacing = res->start - info->io.addr_data;
+       }
        info->io.regsize = DEFAULT_REGSPACING;
        info->io.regshift = 0;
 
@@ -2196,7 +2205,10 @@ static int __devinit ipmi_pnp_probe(struct pnp_dev *dev,
                 res, info->io.regsize, info->io.regspacing,
                 info->irq);
 
-       return add_smi(info);
+       if (add_smi(info))
+               goto err_free;
+
+       return 0;
 
 err_free:
        kfree(info);
@@ -2354,7 +2366,8 @@ static __devinit void try_init_dmi(struct dmi_ipmi_data *ipmi_data)
        if (info->irq)
                info->irq_setup = std_irq_setup;
 
-       add_smi(info);
+       if (add_smi(info))
+               kfree(info);
 }
 
 static void __devinit dmi_find_bmc(void)
@@ -2460,7 +2473,10 @@ static int __devinit ipmi_pci_probe(struct pci_dev *pdev,
                &pdev->resource[0], info->io.regsize, info->io.regspacing,
                info->irq);
 
-       return add_smi(info);
+       if (add_smi(info))
+               kfree(info);
+
+       return 0;
 }
 
 static void __devexit ipmi_pci_remove(struct pci_dev *pdev)
@@ -2573,7 +2589,12 @@ static int __devinit ipmi_of_probe(struct of_device *dev,
 
        dev_set_drvdata(&dev->dev, info);
 
-       return add_smi(info);
+       if (add_smi(info)) {
+               kfree(info);
+               return -EBUSY;
+       }
+
+       return 0;
 }
 
 static int __devexit ipmi_of_remove(struct of_device *dev)
@@ -3006,6 +3027,8 @@ static __devinit void default_find_bmc(void)
                                info->io.addr_data);
                        } else
                                cleanup_one_si(info);
+               } else {
+                       kfree(info);
                }
        }
 }