From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759544Ab0FJSLs (ORCPT ); Thu, 10 Jun 2010 14:11:48 -0400 Received: from vms173019pub.verizon.net ([206.46.173.19]:44389 "EHLO vms173019pub.verizon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751823Ab0FJSLq (ORCPT ); Thu, 10 Jun 2010 14:11:46 -0400 Message-id: <4C112AD1.6000308@acm.org> Date: Thu, 10 Jun 2010 13:11:29 -0500 From: Corey Minyard User-Agent: Mozilla-Thunderbird 2.0.0.24 (X11/20100329) MIME-version: 1.0 To: Matthew Garrett Cc: linux-kernel@vger.kernel.org, Andrew Morton Subject: Re: [PATCH] ipmi: Make sure drivers were registered before unregistering them References: <1276192406-3612-1-git-send-email-mjg@redhat.com> In-reply-to: <1276192406-3612-1-git-send-email-mjg@redhat.com> Content-type: text/plain; charset=ISO-8859-1; format=flowed Content-transfer-encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Yes, thanks for this. Acked-by: Corey Minyard Matthew Garrett wrote: > The ipmi code will never register a PCI or Open Firmware driver if > a hardcoded device is provided by the user. This can cause us to attempt > to unregister a driver that was never registered, resulting in an oops. > Keep track of registration in order to avoid this. > > Signed-off-by: Matthew Garrett > --- > drivers/char/ipmi/ipmi_si_intf.c | 21 +++++++++++++++++---- > 1 files changed, 17 insertions(+), 4 deletions(-) > > diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c > index 35603dd..311f85b 100644 > --- a/drivers/char/ipmi/ipmi_si_intf.c > +++ b/drivers/char/ipmi/ipmi_si_intf.c > @@ -302,6 +302,12 @@ struct smi_info { > > static int force_kipmid[SI_MAX_PARMS]; > static int num_force_kipmid; > +#ifdef CONFIG_PCI > +static int pci_registered; > +#endif > +#ifdef CONFIG_PPC_OF > +static int of_registered; > +#endif > > static unsigned int kipmid_max_busy_us[SI_MAX_PARMS]; > static int num_max_busy_us; > @@ -3314,6 +3320,8 @@ static __devinit int init_ipmi_si(void) > rv = pci_register_driver(&ipmi_pci_driver); > if (rv) > printk(KERN_ERR PFX "Unable to register PCI driver: %d\n", rv); > + else > + pci_registered = 1; > #endif > > #ifdef CONFIG_ACPI > @@ -3330,6 +3338,7 @@ static __devinit int init_ipmi_si(void) > > #ifdef CONFIG_PPC_OF > of_register_platform_driver(&ipmi_of_platform_driver); > + of_registered = 1; > #endif > > /* We prefer devices with interrupts, but in the case of a machine > @@ -3383,11 +3392,13 @@ static __devinit int init_ipmi_si(void) > if (unload_when_empty && list_empty(&smi_infos)) { > mutex_unlock(&smi_infos_lock); > #ifdef CONFIG_PCI > - pci_unregister_driver(&ipmi_pci_driver); > + if (pci_registered) > + pci_unregister_driver(&ipmi_pci_driver); > #endif > > #ifdef CONFIG_PPC_OF > - of_unregister_platform_driver(&ipmi_of_platform_driver); > + if (of_registered) > + of_unregister_platform_driver(&ipmi_of_platform_driver); > #endif > driver_unregister(&ipmi_driver.driver); > printk(KERN_WARNING PFX > @@ -3478,14 +3489,16 @@ static __exit void cleanup_ipmi_si(void) > return; > > #ifdef CONFIG_PCI > - pci_unregister_driver(&ipmi_pci_driver); > + if (pci_registered) > + pci_unregister_driver(&ipmi_pci_driver); > #endif > #ifdef CONFIG_ACPI > pnp_unregister_driver(&ipmi_pnp_driver); > #endif > > #ifdef CONFIG_PPC_OF > - of_unregister_platform_driver(&ipmi_of_platform_driver); > + if (of_registered) > + of_unregister_platform_driver(&ipmi_of_platform_driver); > #endif > > mutex_lock(&smi_infos_lock); >