Commit 89d5dcc4 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Stephen Boyd

clk: stm32f4: avoid uninitialized variable access

The failure path in the newly added function tries to free an
uninitialized pointer:

drivers/clk/clk-stm32f4.c: In function 'stm32f4_rcc_init':
drivers/clk/clk-stm32f4.c:1106:4: error: 'gate' may be used uninitialized in this function [-Werror=maybe-uninitialized]

I'm adding an initialization to NULL here to make the kfree()
succeed, and I'm also rearranging the cleanup so that the
same kfree() is used for any error path, making the function
slightly more robust against newly introduced bugs in the
error handling.

Fixes: daf2d117 ("clk: stm32f4: Add lcd-tft clock")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarGabriel Fernandez <gabriel.fernandez@st.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 545643fd
...@@ -1080,7 +1080,7 @@ static struct clk_hw *stm32_register_aux_clk(const char *name, ...@@ -1080,7 +1080,7 @@ static struct clk_hw *stm32_register_aux_clk(const char *name,
unsigned long flags, spinlock_t *lock) unsigned long flags, spinlock_t *lock)
{ {
struct clk_hw *hw; struct clk_hw *hw;
struct clk_gate *gate; struct clk_gate *gate = NULL;
struct clk_mux *mux = NULL; struct clk_mux *mux = NULL;
struct clk_hw *mux_hw = NULL, *gate_hw = NULL; struct clk_hw *mux_hw = NULL, *gate_hw = NULL;
const struct clk_ops *mux_ops = NULL, *gate_ops = NULL; const struct clk_ops *mux_ops = NULL, *gate_ops = NULL;
...@@ -1103,7 +1103,6 @@ static struct clk_hw *stm32_register_aux_clk(const char *name, ...@@ -1103,7 +1103,6 @@ static struct clk_hw *stm32_register_aux_clk(const char *name,
if (offset_mux != NO_MUX) { if (offset_mux != NO_MUX) {
mux = kzalloc(sizeof(*mux), GFP_KERNEL); mux = kzalloc(sizeof(*mux), GFP_KERNEL);
if (!mux) { if (!mux) {
kfree(gate);
hw = ERR_PTR(-EINVAL); hw = ERR_PTR(-EINVAL);
goto fail; goto fail;
} }
...@@ -1116,8 +1115,10 @@ static struct clk_hw *stm32_register_aux_clk(const char *name, ...@@ -1116,8 +1115,10 @@ static struct clk_hw *stm32_register_aux_clk(const char *name,
mux_ops = &clk_mux_ops; mux_ops = &clk_mux_ops;
} }
if (mux_hw == NULL && gate_hw == NULL) if (mux_hw == NULL && gate_hw == NULL) {
return ERR_PTR(-EINVAL); hw = ERR_PTR(-EINVAL);
goto fail;
}
hw = clk_hw_register_composite(NULL, name, parent_names, num_parents, hw = clk_hw_register_composite(NULL, name, parent_names, num_parents,
mux_hw, mux_ops, mux_hw, mux_ops,
...@@ -1125,11 +1126,12 @@ static struct clk_hw *stm32_register_aux_clk(const char *name, ...@@ -1125,11 +1126,12 @@ static struct clk_hw *stm32_register_aux_clk(const char *name,
gate_hw, gate_ops, gate_hw, gate_ops,
flags); flags);
fail:
if (IS_ERR(hw)) { if (IS_ERR(hw)) {
kfree(gate); kfree(gate);
kfree(mux); kfree(mux);
} }
fail:
return hw; return hw;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment