Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e0ad7d2 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Michael Turquette
Browse files

clk: Don't dereference parent clock if is NULL 



The clock passed as an argument to clk_mux_determine_rate_flags()
has the CLK_SET_RATE_PARENT flag set but it has no parent, then a
NULL pointer will tried to be dereferenced.

This shouldn't happen since setting that flag for a clock with no
parent is a bug but the core should be robust to handle that case.

Fixes: 035a61c3 ("clk: Make clk API return per-user struct clk instances")
Signed-off-by: default avatarJavier Martinez Canillas <javier.martinez@collabora.co.uk>
Reviewed-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarMichael Turquette <mturquette@linaro.org>
parent 69b59cb8

drivers/clk/clk.c

+2 −2
Original line number Diff line number Diff line
@@ -800,8 +800,8 @@ clk_mux_determine_rate_flags(struct clk_hw *hw, unsigned long rate, 
	if (core->flags & CLK_SET_RATE_NO_REPARENT) {

		parent = core->parent;

		if (core->flags & CLK_SET_RATE_PARENT)

			best = __clk_determine_rate(parent->hw, rate,

						    min_rate, max_rate);

			best = __clk_determine_rate(parent ? parent->hw : NULL,

						    rate, min_rate, max_rate);

		else if (parent)

			best = clk_core_get_rate_nolock(parent);

		else