| Message ID | 20210911172003.899301-1-seanga2@gmail.com |
|---|---|
| State | Accepted |
| Commit | 54d5d2d56bb6c46c996a4d249dbae3b12a7a4fac |
| Delegated to: | Andes |
| Headers | show |
| Series | [v2,1/4] clk: k210: Fix checking if ulongs are less than 0 | expand |
On Sat, Sep 11, 2021 at 01:20:00PM -0400, Sean Anderson wrote: > The PLL functions take ulong arguments for rate, but still check if that > rate is negative (which is never true). The correct way to handle this is > to use IS_ERR_VALUE (like is already done in k210_clk_set_rate). While > we're at it, we can move the error checking up into the caller of the pll > set/get rate functions. This also protects our other calculations from > using bogus values for rate. > > Fixes: 609bd60b94 ("clk: k210: Rewrite to remove CCF") > Reported-by: Coverity Scan <scan-admin@coverity.com> > Signed-off-by: Sean Anderson <seanga2@gmail.com> > --- > > Changes in v2: > - Reworked patch to use IS_ERR_VALUE instead of changing arguments to long > > drivers/clk/clk_kendryte.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com> CONFIDENTIALITY NOTICE: This e-mail (and its attachments) may contain confidential and legally privileged information or information protected from disclosure. If you are not the intended recipient, you are hereby notified that any disclosure, copying, distribution, or use of the information contained herein is strictly prohibited. In this case, please immediately notify the sender by return e-mail, delete the message (and any accompanying documents) and destroy all printed hard copies. Thank you for your cooperation. Copyright ANDES TECHNOLOGY CORPORATION - All Rights Reserved.
diff --git a/drivers/clk/clk_kendryte.c b/drivers/clk/clk_kendryte.c index 3148756968..2caa21aec9 100644 --- a/drivers/clk/clk_kendryte.c +++ b/drivers/clk/clk_kendryte.c @@ -849,9 +849,6 @@ static ulong k210_pll_set_rate(struct k210_clk_priv *priv, int id, ulong rate, u32 reg; ulong calc_rate; - if (rate_in < 0) - return rate_in; - err = k210_pll_calc_config(rate, rate_in, &config); if (err) return err; @@ -895,7 +892,7 @@ static ulong k210_pll_get_rate(struct k210_clk_priv *priv, int id, u64 r, f, od; u32 reg = readl(priv->base + k210_plls[id].off); - if (rate_in < 0 || (reg & K210_PLL_BYPASS)) + if (reg & K210_PLL_BYPASS) return rate_in; if (!(reg & K210_PLL_PWRD)) @@ -1029,6 +1026,8 @@ static ulong do_k210_clk_get_rate(struct k210_clk_priv *priv, int id) parent = k210_clk_get_parent(priv, id); parent_rate = do_k210_clk_get_rate(priv, parent); + if (IS_ERR_VALUE(parent_rate)) + return parent_rate; if (k210_clks[id].flags & K210_CLKF_PLL) return k210_pll_get_rate(priv, k210_clks[id].pll, parent_rate); @@ -1099,6 +1098,8 @@ static ulong k210_clk_set_rate(struct clk *clk, unsigned long rate) parent = k210_clk_get_parent(priv, clk->id); rate_in = do_k210_clk_get_rate(priv, parent); + if (IS_ERR_VALUE(rate_in)) + return rate_in; log_debug("id=%ld rate=%lu rate_in=%lu\n", clk->id, rate, rate_in);
The PLL functions take ulong arguments for rate, but still check if that rate is negative (which is never true). The correct way to handle this is to use IS_ERR_VALUE (like is already done in k210_clk_set_rate). While we're at it, we can move the error checking up into the caller of the pll set/get rate functions. This also protects our other calculations from using bogus values for rate. Fixes: 609bd60b94 ("clk: k210: Rewrite to remove CCF") Reported-by: Coverity Scan <scan-admin@coverity.com> Signed-off-by: Sean Anderson <seanga2@gmail.com> --- Changes in v2: - Reworked patch to use IS_ERR_VALUE instead of changing arguments to long drivers/clk/clk_kendryte.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)