| Message ID | 20180316114442.9536-1-anders.roxell@linaro.org |
|---|---|
| State | Accepted |
| Commit | b5e817dcdd556da2b74c66af1cf0f44840283102 |
| Headers | show |
| Series | firmware: arm_scmi: prevent accessing rate_discrete uninitialized | expand |
Hi Anders, On 16/03/18 11:44, Anders Roxell wrote: > gcc-5.3 and earlier warns that rate_discrete maybe-uninitialized > ../drivers/firmware/arm_scmi/clock.c:185:5: warning: 'rate_discrete' > may be used uninitialized in this function [-Wmaybe-uninitialized] > if (rate_discrete) > ^ > ../drivers/firmware/arm_scmi/clock.c:128:7: note: > 'rate_discrete' was declared here > bool rate_discrete; > ^ > Thanks for the fix, applied. -- Regards, Sudeep
diff --git a/drivers/firmware/arm_scmi/clock.c b/drivers/firmware/arm_scmi/clock.c index e8ffad33a0ff..e6f17825db79 100644 --- a/drivers/firmware/arm_scmi/clock.c +++ b/drivers/firmware/arm_scmi/clock.c @@ -125,7 +125,7 @@ scmi_clock_describe_rates_get(const struct scmi_handle *handle, u32 clk_id, { u64 *rate; int ret, cnt; - bool rate_discrete; + bool rate_discrete = false; u32 tot_rate_cnt = 0, rates_flag; u16 num_returned, num_remaining; struct scmi_xfer *t; @@ -147,7 +147,7 @@ scmi_clock_describe_rates_get(const struct scmi_handle *handle, u32 clk_id, ret = scmi_do_xfer(handle, t); if (ret) - break; + goto err; rates_flag = le32_to_cpu(rlist->num_rates_flags); num_remaining = NUM_REMAINING(rates_flag); @@ -185,6 +185,7 @@ scmi_clock_describe_rates_get(const struct scmi_handle *handle, u32 clk_id, if (rate_discrete) clk->list.num_rates = tot_rate_cnt; +err: scmi_one_xfer_put(handle, t); return ret; }
gcc-5.3 and earlier warns that rate_discrete maybe-uninitialized ../drivers/firmware/arm_scmi/clock.c:185:5: warning: 'rate_discrete' may be used uninitialized in this function [-Wmaybe-uninitialized] if (rate_discrete) ^ ../drivers/firmware/arm_scmi/clock.c:128:7: note: 'rate_discrete' was declared here bool rate_discrete; ^ Fixes: 5f6c6430e904 ("firmware: arm_scmi: add initial support for clock protocol") Signed-off-by: Anders Roxell <anders.roxell@linaro.org> --- drivers/firmware/arm_scmi/clock.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.11.0