* [PATCH][V2] clk: uniphier: Fix potential infinite loop
@ 2021-04-09 9:01 Colin King
2021-04-09 9:01 ` Colin King
0 siblings, 1 reply; 4+ messages in thread
From: Colin King @ 2021-04-09 9:01 UTC (permalink / raw)
To: Michael Turquette, Stephen Boyd, Masahiro Yamada, linux-clk,
linux-arm-kernel
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
The for-loop iterates with a u8 loop counter i and compares this
with the loop upper limit of num_parents that is an int type.
There is a potential infinite loop if num_parents is larger than
the u8 loop counter. Fix this by making the loop counter the same
type as num_parents. Also make num_parents an unsigned int to
match the return type of the call to clk_hw_get_num_parents.
Addresses-Coverity: ("Infinite loop")
Fixes: 734d82f4a678 ("clk: uniphier: add core support code for UniPhier clock driver")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
V2: Make num_parents an unsigned int to match return type of
clk_hw_get_num_parents().
---
drivers/clk/uniphier/clk-uniphier-mux.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/uniphier/clk-uniphier-mux.c b/drivers/clk/uniphier/clk-uniphier-mux.c
index 462c84321b2d..1998e9d4cfc0 100644
--- a/drivers/clk/uniphier/clk-uniphier-mux.c
+++ b/drivers/clk/uniphier/clk-uniphier-mux.c
@@ -31,10 +31,10 @@ static int uniphier_clk_mux_set_parent(struct clk_hw *hw, u8 index)
static u8 uniphier_clk_mux_get_parent(struct clk_hw *hw)
{
struct uniphier_clk_mux *mux = to_uniphier_clk_mux(hw);
- int num_parents = clk_hw_get_num_parents(hw);
+ unsigned int num_parents = clk_hw_get_num_parents(hw);
int ret;
unsigned int val;
- u8 i;
+ unsigned int i;
ret = regmap_read(mux->regmap, mux->reg, &val);
if (ret)
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH][V2] clk: uniphier: Fix potential infinite loop
2021-04-09 9:01 [PATCH][V2] clk: uniphier: Fix potential infinite loop Colin King
@ 2021-04-09 9:01 ` Colin King
2021-04-09 18:28 ` Masahiro Yamada
2021-04-13 2:10 ` Stephen Boyd
0 siblings, 2 replies; 4+ messages in thread
From: Colin King @ 2021-04-09 9:01 UTC (permalink / raw)
To: Michael Turquette, Stephen Boyd, Masahiro Yamada, linux-clk,
linux-arm-kernel
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
The for-loop iterates with a u8 loop counter i and compares this
with the loop upper limit of num_parents that is an int type.
There is a potential infinite loop if num_parents is larger than
the u8 loop counter. Fix this by making the loop counter the same
type as num_parents. Also make num_parents an unsigned int to
match the return type of the call to clk_hw_get_num_parents.
Addresses-Coverity: ("Infinite loop")
Fixes: 734d82f4a678 ("clk: uniphier: add core support code for UniPhier clock driver")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
V2: Make num_parents an unsigned int to match return type of
clk_hw_get_num_parents().
---
drivers/clk/uniphier/clk-uniphier-mux.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/uniphier/clk-uniphier-mux.c b/drivers/clk/uniphier/clk-uniphier-mux.c
index 462c84321b2d..1998e9d4cfc0 100644
--- a/drivers/clk/uniphier/clk-uniphier-mux.c
+++ b/drivers/clk/uniphier/clk-uniphier-mux.c
@@ -31,10 +31,10 @@ static int uniphier_clk_mux_set_parent(struct clk_hw *hw, u8 index)
static u8 uniphier_clk_mux_get_parent(struct clk_hw *hw)
{
struct uniphier_clk_mux *mux = to_uniphier_clk_mux(hw);
- int num_parents = clk_hw_get_num_parents(hw);
+ unsigned int num_parents = clk_hw_get_num_parents(hw);
int ret;
unsigned int val;
- u8 i;
+ unsigned int i;
ret = regmap_read(mux->regmap, mux->reg, &val);
if (ret)
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH][V2] clk: uniphier: Fix potential infinite loop
2021-04-09 9:01 ` Colin King
@ 2021-04-09 18:28 ` Masahiro Yamada
2021-04-13 2:10 ` Stephen Boyd
1 sibling, 0 replies; 4+ messages in thread
From: Masahiro Yamada @ 2021-04-09 18:28 UTC (permalink / raw)
To: Colin King
Cc: Michael Turquette, Stephen Boyd, linux-clk, linux-arm-kernel,
kernel-janitors, Linux Kernel Mailing List
On Fri, Apr 9, 2021 at 6:01 PM Colin King <colin.king@canonical.com> wrote:
>
> From: Colin Ian King <colin.king@canonical.com>
>
> The for-loop iterates with a u8 loop counter i and compares this
> with the loop upper limit of num_parents that is an int type.
> There is a potential infinite loop if num_parents is larger than
> the u8 loop counter. Fix this by making the loop counter the same
> type as num_parents. Also make num_parents an unsigned int to
> match the return type of the call to clk_hw_get_num_parents.
>
> Addresses-Coverity: ("Infinite loop")
> Fixes: 734d82f4a678 ("clk: uniphier: add core support code for UniPhier clock driver")
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>
> V2: Make num_parents an unsigned int to match return type of
> clk_hw_get_num_parents().
Reviewed-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
> drivers/clk/uniphier/clk-uniphier-mux.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/clk/uniphier/clk-uniphier-mux.c b/drivers/clk/uniphier/clk-uniphier-mux.c
> index 462c84321b2d..1998e9d4cfc0 100644
> --- a/drivers/clk/uniphier/clk-uniphier-mux.c
> +++ b/drivers/clk/uniphier/clk-uniphier-mux.c
> @@ -31,10 +31,10 @@ static int uniphier_clk_mux_set_parent(struct clk_hw *hw, u8 index)
> static u8 uniphier_clk_mux_get_parent(struct clk_hw *hw)
> {
> struct uniphier_clk_mux *mux = to_uniphier_clk_mux(hw);
> - int num_parents = clk_hw_get_num_parents(hw);
> + unsigned int num_parents = clk_hw_get_num_parents(hw);
> int ret;
> unsigned int val;
> - u8 i;
> + unsigned int i;
>
> ret = regmap_read(mux->regmap, mux->reg, &val);
> if (ret)
> --
> 2.30.2
>
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH][V2] clk: uniphier: Fix potential infinite loop
2021-04-09 9:01 ` Colin King
2021-04-09 18:28 ` Masahiro Yamada
@ 2021-04-13 2:10 ` Stephen Boyd
1 sibling, 0 replies; 4+ messages in thread
From: Stephen Boyd @ 2021-04-13 2:10 UTC (permalink / raw)
To: Colin King, Masahiro Yamada, Michael Turquette, linux-arm-kernel,
linux-clk
Cc: kernel-janitors, linux-kernel
Quoting Colin King (2021-04-09 02:01:04)
> From: Colin Ian King <colin.king@canonical.com>
>
> The for-loop iterates with a u8 loop counter i and compares this
> with the loop upper limit of num_parents that is an int type.
> There is a potential infinite loop if num_parents is larger than
> the u8 loop counter. Fix this by making the loop counter the same
> type as num_parents. Also make num_parents an unsigned int to
> match the return type of the call to clk_hw_get_num_parents.
>
> Addresses-Coverity: ("Infinite loop")
> Fixes: 734d82f4a678 ("clk: uniphier: add core support code for UniPhier clock driver")
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
Applied to clk-next
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-04-13 2:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-09 9:01 [PATCH][V2] clk: uniphier: Fix potential infinite loop Colin King
2021-04-09 9:01 ` Colin King
2021-04-09 18:28 ` Masahiro Yamada
2021-04-13 2:10 ` Stephen Boyd
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).