[PATCH] clk: renesas: rcar-usb2-clock-sel: Fix kernel NULL pointer dereference

[PATCH] clk: renesas: rcar-usb2-clock-sel: Fix kernel NULL pointer dereference

[Adam Ford]

The probe was manually passing NULL instead of dev to devm_clk_hw_register.
This caused a Unable to handle kernel NULL pointer dereference error.
Fix this by passing 'dev'.

Signed-off-by: Adam Ford <aford173@gmail.com>

diff --git a/drivers/clk/renesas/rcar-usb2-clock-sel.c b/drivers/clk/renesas/rcar-usb2-clock-sel.c
index 9fb79bd79435..684d8937965e 100644
--- a/drivers/clk/renesas/rcar-usb2-clock-sel.c
+++ b/drivers/clk/renesas/rcar-usb2-clock-sel.c
@@ -187,7 +187,7 @@ static int rcar_usb2_clock_sel_probe(struct platform_device *pdev)
 	init.ops = &usb2_clock_sel_clock_ops;
 	priv->hw.init = &init;
 
-	ret = devm_clk_hw_register(NULL, &priv->hw);
+	ret = devm_clk_hw_register(dev, &priv->hw);
 	if (ret)
 		goto pm_put;
 
-- 
2.25.1

Re: [PATCH] clk: renesas: rcar-usb2-clock-sel: Fix kernel NULL pointer dereference

[Geert Uytterhoeven]

On Thu, Aug 26, 2021 at 4:17 PM Adam Ford <aford173@gmail.com> wrote:
> The probe was manually passing NULL instead of dev to devm_clk_hw_register.
> This caused a Unable to handle kernel NULL pointer dereference error.
> Fix this by passing 'dev'.
>
> Signed-off-by: Adam Ford <aford173@gmail.com>

Fixes: a20a40a8bbc2cf4b ("clk: renesas: rcar-usb2-clock-sel: Fix error
handling in .probe()")
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Mike/Stephen: Can you please take this one directly, as we're
already at rc7.
Thanks!

> --- a/drivers/clk/renesas/rcar-usb2-clock-sel.c
> +++ b/drivers/clk/renesas/rcar-usb2-clock-sel.c
> @@ -187,7 +187,7 @@ static int rcar_usb2_clock_sel_probe(struct platform_device *pdev)
>         init.ops = &usb2_clock_sel_clock_ops;
>         priv->hw.init = &init;
>
> -       ret = devm_clk_hw_register(NULL, &priv->hw);
> +       ret = devm_clk_hw_register(dev, &priv->hw);
>         if (ret)
>                 goto pm_put;
>
> --
> 2.25.1

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] clk: renesas: rcar-usb2-clock-sel: Fix kernel NULL pointer dereference

[Stephen Boyd]

Quoting Geert Uytterhoeven (2021-08-26 10:42:29)
> On Thu, Aug 26, 2021 at 4:17 PM Adam Ford <aford173@gmail.com> wrote:
> > The probe was manually passing NULL instead of dev to devm_clk_hw_register.
> > This caused a Unable to handle kernel NULL pointer dereference error.
> > Fix this by passing 'dev'.
> >
> > Signed-off-by: Adam Ford <aford173@gmail.com>
> 
> Fixes: a20a40a8bbc2cf4b ("clk: renesas: rcar-usb2-clock-sel: Fix error
> handling in .probe()")
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> 
> Mike/Stephen: Can you please take this one directly, as we're
> already at rc7.
> Thanks!
> 

It looks highly unlikely to make the cut but I'll try to send it off to
Linus tomorrow.

Re: [PATCH] clk: renesas: rcar-usb2-clock-sel: Fix kernel NULL pointer dereference

[Stephen Boyd]

Quoting Adam Ford (2021-08-26 07:17:21)
> The probe was manually passing NULL instead of dev to devm_clk_hw_register.
> This caused a Unable to handle kernel NULL pointer dereference error.
> Fix this by passing 'dev'.
> 
> Signed-off-by: Adam Ford <aford173@gmail.com>
> 
> diff --git a/drivers/clk/renesas/rcar-usb2-clock-sel.c b/drivers/clk/renesas/rcar-usb2-clock-sel.c
> index 9fb79bd79435..684d8937965e 100644
> --- a/drivers/clk/renesas/rcar-usb2-clock-sel.c

Applied to clk-fixes