hostap_cs: fix sleeping function called from invalid context

commit 4e5518ca53be29c1ec3c00089c97bef36bfed515 upstream.

pcmcia_request_irq() and pcmcia_enable_device() are intended
to be called from process context (first function allocate memory
with GFP_KERNEL, second take a mutex). We can not take spin lock
and call them.

It's safe to move spin lock after pcmcia_enable_device() as we
still hold off IRQ until dev->base_addr is 0 and driver will
not proceed with interrupts when is not ready.

Patch resolves:
https://bugzilla.redhat.com/show_bug.cgi?id=643758

Reported-and-tested-by: rbugz@biobind.com
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index b4ff1dc1d72d8cef60854d1bd3b9081f891b41e0..6992f8ff229491bda4508dd1b724912b7eecd737 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -661,12 +661,6 @@ static int prism2_config(struct pcmcia_device *link)
        strcpy(hw_priv->node.dev_name, dev->name);
        link->dev_node = &hw_priv->node;
 
-       /*
-        * Make sure the IRQ handler cannot proceed until at least
-        * dev->base_addr is initialized.
-        */
-       spin_lock_irqsave(&local->irq_init_lock, flags);
-
        /*
         * Allocate an interrupt line.  Note that this does not assign a
         * handler to the interrupt, unless the 'Handler' member of the
@@ -690,9 +684,10 @@ static int prism2_config(struct pcmcia_device *link)
        CS_CHECK(RequestConfiguration,
                 pcmcia_request_configuration(link, &link->conf));
 
+       /* IRQ handler cannot proceed until at dev->base_addr is initialized */
+       spin_lock_irqsave(&local->irq_init_lock, flags);
        dev->irq = link->irq.AssignedIRQ;
        dev->base_addr = link->io.BasePort1;
-
        spin_unlock_irqrestore(&local->irq_init_lock, flags);
 
        /* Finally, report what we've done */
@@ -724,7 +719,6 @@ static int prism2_config(struct pcmcia_device *link)
        return ret;
 
  cs_failed:
-       spin_unlock_irqrestore(&local->irq_init_lock, flags);
        cs_error(link, last_fn, last_ret);
 
  failed: