Re: [PATCH] char/ipmi: fix OOPS caused by pnp_unregister_driver on unregistered driver

[Peter Hüwe]

Am Donnerstag 10 Februar 2011, 23:08:38 schrieb Corey Minyard:
> This patch fixes an OOPS triggered when calling modprobe ipmi_si a
> second time after the first modprobe returned without finding any ipmi
> devices.  This can happen if you reload the module after having the
> first module load fail.  The driver was not deregistering from
> PNP in that case.
> 
> Peter Huewe originally reported this patch and supplied a fix, I have
> a different patch based on Linus' suggestion that cleans things up a
> bit more.
> 
> KernelVersion: 2.6.37
> Cc: <stable@xxxxxxxxxx>
> Cc: <openipmi-developer@xxxxxxxxxxxxxxxxxxxxx>
> Cc: Peter Huewe <peterhuewe@xxxxxx>
> Cc: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
> Signed-off-by: Corey Minyard <cminyard@xxxxxxxxxx>
> ---
>  drivers/char/ipmi/ipmi_si_intf.c |   12 ++----------
>  1 files changed, 2 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/char/ipmi/ipmi_si_intf.c
> b/drivers/char/ipmi/ipmi_si_intf.c index b6ae6e9..7855f9f 100644
> --- a/drivers/char/ipmi/ipmi_si_intf.c
> +++ b/drivers/char/ipmi/ipmi_si_intf.c
> @@ -320,6 +320,7 @@ static int unload_when_empty = 1;
>  static int add_smi(struct smi_info *smi);
>  static int try_smi_init(struct smi_info *smi);
>  static void cleanup_one_si(struct smi_info *to_clean);
> +static void cleanup_ipmi_si(void);
> 
>  static ATOMIC_NOTIFIER_HEAD(xaction_notifier_list);
>  static int register_xaction_notifier(struct notifier_block *nb)
> @@ -3450,16 +3451,7 @@ static int __devinit init_ipmi_si(void)
>  	mutex_lock(&smi_infos_lock);
>  	if (unload_when_empty && list_empty(&smi_infos)) {
>  		mutex_unlock(&smi_infos_lock);
> -#ifdef CONFIG_PCI
> -		if (pci_registered)
> -			pci_unregister_driver(&ipmi_pci_driver);
> -#endif
> -
> -#ifdef CONFIG_PPC_OF
> -		if (of_registered)
> -			of_unregister_platform_driver(&ipmi_of_platform_driver);
> -#endif
> -		driver_unregister(&ipmi_driver.driver);
> +		cleanup_ipmi_si();
>  		printk(KERN_WARNING PFX
>  		       "Unable to find any System Interface(s)\n");
>  		return -ENODEV;

Looks good to me - thanks.

Reviewed-by: Peter Huewe <peterhuewe@xxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/