lkml.org 
[lkml]   [2011]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[067/115] hostap_cs: fix sleeping function called from invalid context
    2.6.32-longterm review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Stanislaw Gruszka <sgruszka@redhat.com>

    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>


    ---
    drivers/net/wireless/hostap/hostap_cs.c | 10 ++--------
    1 file changed, 2 insertions(+), 8 deletions(-)

    --- a/drivers/net/wireless/hostap/hostap_cs.c
    +++ b/drivers/net/wireless/hostap/hostap_cs.c
    @@ -662,12 +662,6 @@ static int prism2_config(struct pcmcia_d
    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
    * irq structure is initialized.
    @@ -690,9 +684,10 @@ static int prism2_config(struct pcmcia_d
    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_d
    return ret;

    cs_failed:
    - spin_unlock_irqrestore(&local->irq_init_lock, flags);
    cs_error(link, last_fn, last_ret);

    failed:



    \
     
     \ /
      Last update: 2011-02-16 02:57    [W:4.159 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site