linux-kernel - Re: [PATCH 1/3] btmrvl: avoid double-disable

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20170120192916.GC84521@google.com>
Date:   Fri, 20 Jan 2017 11:29:17 -0800
From:   Brian Norris <briannorris@...omium.org>
To:     Jeffy Chen <jeffy.chen@...k-chips.com>
Cc:     linux-bluetooth@...r.kernel.org,
        Amitkumar Karwar <akarwar@...vell.com>,
        Marcel Holtmann <marcel@...tmann.org>,
        Johan Hedberg <johan.hedberg@...il.com>,
        Gustavo Padovan <gustavo@...ovan.org>,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/3] btmrvl: avoid double-disable_irq() race

On Fri, Jan 20, 2017 at 07:14:18PM +0800, Jeffy Chen wrote:
> It's much the same as what we did for mwifiex in:
> b9da4d2 mwifiex: avoid double-disable_irq() race

You could still stand to borrow some of the explanation for your commit
message here...

> Signed-off-by: Jeffy Chen <jeffy.chen@...k-chips.com>

Fix looks good:

Reviewed-by: Brian Norris <briannorris@...omium.org>

> ---
> 
>  drivers/bluetooth/btmrvl_sdio.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
> index d02f2c1..c738bae 100644
> --- a/drivers/bluetooth/btmrvl_sdio.c
> +++ b/drivers/bluetooth/btmrvl_sdio.c
> @@ -1682,8 +1682,12 @@ static int btmrvl_sdio_resume(struct device *dev)
>  	/* Disable platform specific wakeup interrupt */
>  	if (card->plt_wake_cfg && card->plt_wake_cfg->irq_bt >= 0) {
>  		disable_irq_wake(card->plt_wake_cfg->irq_bt);
> -		if (!card->plt_wake_cfg->wake_by_bt)
> -			disable_irq(card->plt_wake_cfg->irq_bt);
> +		disable_irq(card->plt_wake_cfg->irq_bt);
> +		if (card->plt_wake_cfg->wake_by_bt)
> +			/* Undo our disable, since interrupt handler already
> +			 * did this.
> +			 */
> +			enable_irq(card->plt_wake_cfg->irq_bt);
>  	}
>  
>  	return 0;
> -- 
> 2.1.4
> 
>