2015-06-27 06:53:24

by Maxime Coquelin

[permalink] [raw]
Subject: Re: [tip:irq/urgent] pinctrl/st: Fix race in installing chained IRQ handler

Hello Thomas,

On 06/26/2015 09:45 PM, tip-bot for Thomas Gleixner wrote:
> Commit-ID: 1b11b0cb799e5f82ca6391a23eaa8f41c7466cc0
> Gitweb: http://git.kernel.org/tip/1b11b0cb799e5f82ca6391a23eaa8f41c7466cc0
> Author: Thomas Gleixner <[email protected]>
> AuthorDate: Sun, 21 Jun 2015 20:16:15 +0200
> Committer: Thomas Gleixner <[email protected]>
> CommitDate: Thu, 25 Jun 2015 11:57:09 +0200
>
> pinctrl/st: Fix race in installing chained IRQ handler
>
> Fix a race where a pending interrupt could be received and the handler
> called before the handler's data has been setup, by converting to
> irq_set_chained_handler_and_data().
>
> Search and conversion was done with coccinelle:
>
> @@
> expression E1, E2, E3;
> @@
> (
> -if (irq_set_chained_handler(E1, E3) != 0)
> - BUG();
> |
> -irq_set_chained_handler(E1, E3);
> )
> -irq_set_handler_data(E1, E2);
> +irq_set_chained_handler_and_data(E1, E3, E2);
>
> @@
> expression E1, E2, E3;
> @@
> (
> -if (irq_set_chained_handler(E1, E3) != 0)
> - BUG();
> ...
> |
> -irq_set_chained_handler(E1, E3);
> ...
> )
> -irq_set_handler_data(E1, E2);
> +irq_set_chained_handler_and_data(E1, E3, E2);
>
> Reported-by: Russell King <[email protected]>
> Signed-off-by: Thomas Gleixner <[email protected]>
> Cc: Julia Lawall <[email protected]>
> Cc: Srinivas Kandagatla <[email protected]>
> Cc: Maxime Coquelin <[email protected]>
> Cc: Patrice Chotard <[email protected]>
> Cc: Linus Walleij <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> ---
> drivers/pinctrl/pinctrl-st.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pinctrl/pinctrl-st.c b/drivers/pinctrl/pinctrl-st.c
> index 65bf73b..10e9c4e8 100644
> --- a/drivers/pinctrl/pinctrl-st.c
> +++ b/drivers/pinctrl/pinctrl-st.c
> @@ -1661,8 +1661,8 @@ static int st_pctl_probe_dt(struct platform_device *pdev,
> if (IS_ERR(info->irqmux_base))
> return PTR_ERR(info->irqmux_base);
>
> - irq_set_chained_handler(irq, st_gpio_irqmux_handler);
> - irq_set_handler_data(irq, info);
> + irq_set_chained_handler_and_data(irq, st_gpio_irqmux_handler,
> + info);
>
> }
>

I cannot test the patch before Monday, but it looks good to me:
Acked-by: Maxime Coquelin <[email protected]>

Thanks!
Maxime