Skip to contentSkip to conversation

fix pllv3 defects reported by Coverity

PATCH Superseded Giulio Benetti 2 participants 11 messages Jan 17, 2020 – Jan 26, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover fix pllv3 defects reported by Coverity

Giulio Benetti (3):
clk: imx: pllv3: fix potential 'divide by zero' in sys_get_rate()
clk: imx: pllv3: fix potential 'divide by zero' in av_get_rate()
clk: imx: pllv3: fix potential 'divide by zero' in av_set_rate()

 drivers/clk/imx/clk-pllv3.c | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/3 clk: imx: pllv3: fix potential 'divide by zero' in sys_get_rate()

Guard 'parent_rate==0' to prevent 'divide by zero' issue in clk_pplv3_sys_get_rate(). Also, guard 'parent_rate<0' that would mean that clk_get_parent_rate() returned an error, so better to return early with error EINVAL.

---
 drivers/clk/imx/clk-pllv3.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/clk/imx/clk-pllv3.c +8 -2
index fc16416d5f..0d8e39cfbb 100644
@@ -121,10 +121,16 @@ static ulong clk_pllv3_sys_set_rate(struct clk *clk, ulong rate)
 {
 	struct clk_pllv3 *pll = to_clk_pllv3(clk);
 	unsigned long parent_rate = clk_get_parent_rate(clk);
-	unsigned long min_rate = parent_rate * 54 / 2;
-	unsigned long max_rate = parent_rate * 108 / 2;
+	unsigned long min_rate;
+	unsigned long max_rate;
 	u32 val, div;
 
+	if (parent_rate <= 0)
+		return -EINVAL;
+
+	min_rate = parent_rate * 54 / 2;
+	max_rate = parent_rate * 108 / 2;
+
 	if (rate < min_rate || rate > max_rate)
 		return -EINVAL;
 
Signature · 1 line
2.20.1
#2 lore raw

PATCH 1/3 clk: imx: pllv3: fix potential 'divide by zero' in sys_get_rate()

Quoted 16 lines · Giulio Benetti

Guard 'parent_rate==0' to prevent 'divide by zero' issue in clk_pplv3_sys_get_rate(). Also, guard 'parent_rate<0' that would mean that clk_get_parent_rate() returned an error, so better to return early with error EINVAL.

---
 drivers/clk/imx/clk-pllv3.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/clk/imx/clk-pllv3.c +0 -0
index fc16416d5f..0d8e39cfbb 100644

drivers/clk/imx/clk-pllv3.c static ulong clk_pllv3_sys_set_rate(struct clk *clk, ulong rate) · line 123

Quoted 3 lines
drivers/clk/imx/clk-pllv3.c +0 -0
@@ -121,10 +121,16 @@ static ulong clk_pllv3_sys_set_rate(struct clk *clk, ulong rate)
 {
        struct clk_pllv3 *pll = to_clk_pllv3(clk);
        unsigned long parent_rate = clk_get_parent_rate(clk);

parent_rate is unsigned here...

drivers/clk/imx/clk-pllv3.c static ulong clk_pllv3_sys_set_rate(struct clk *clk, ulong rate) · line 128

Quoted 7 lines
drivers/clk/imx/clk-pllv3.c +3 -2
-       unsigned long min_rate = parent_rate * 54 / 2;
-       unsigned long max_rate = parent_rate * 108 / 2;
+       unsigned long min_rate;
+       unsigned long max_rate;
        u32 val, div;
 
+       if (parent_rate <= 0)

So I don't see how it is possible that it could be < 0.

drivers/clk/imx/clk-pllv3.c static ulong clk_pllv3_sys_set_rate(struct clk *clk, ulong rate)

Quoted 9 lines
drivers/clk/imx/clk-pllv3.c +5 -1
+               return -EINVAL;
+
+       min_rate = parent_rate * 54 / 2;
+       max_rate = parent_rate * 108 / 2;
+
        if (rate < min_rate || rate > max_rate)
                return -EINVAL;
 
--

adam

Quoted 2 lines

2.20.1

#3 lore raw

PATCH 1/3 clk: imx: pllv3: fix potential 'divide by zero' in sys_get_rate()

Hi Adam,

Quoted 13 lines · Adam Ford
Quoted 11 lines · Giulio Benetti

Guard 'parent_rate==0' to prevent 'divide by zero' issue in clk_pplv3_sys_get_rate(). Also, guard 'parent_rate<0' that would mean that clk_get_parent_rate() returned an error, so better to return early with error EINVAL.

---
  drivers/clk/imx/clk-pllv3.c | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
Quoted 10 lines

drivers/clk/imx/clk-pllv3.c static ulong clk_pllv3_sys_set_rate(struct clk *clk, ulong rate) · line 123

Quoted 8 lines
drivers/clk/imx/clk-pllv3.c +0 -0
index fc16416d5f..0d8e39cfbb 100644
@@ -121,10 +121,16 @@ static ulong clk_pllv3_sys_set_rate(struct clk *clk, ulong rate)
  {
         struct clk_pllv3 *pll = to_clk_pllv3(clk);
         unsigned long parent_rate = clk_get_parent_rate(clk);

parent_rate is unsigned here...

Oops, I didn't notice it. I'm going to guard "parent_rate==0" only then. Same for other patches I've submitted.

Thank you
Best regards

Signature · 2 lines
Giulio Benetti
Benetti Engineering sas
Quoted 26 lines

drivers/clk/imx/clk-pllv3.c static ulong clk_pllv3_sys_set_rate(struct clk *clk, ulong rate) · line 128

Quoted 7 lines
drivers/clk/imx/clk-pllv3.c +3 -2
-       unsigned long min_rate = parent_rate * 54 / 2;
-       unsigned long max_rate = parent_rate * 108 / 2;
+       unsigned long min_rate;
+       unsigned long max_rate;
         u32 val, div;
 
+       if (parent_rate <= 0)

So I don't see how it is possible that it could be < 0.

drivers/clk/imx/clk-pllv3.c static ulong clk_pllv3_sys_set_rate(struct clk *clk, ulong rate)

Quoted 9 lines
drivers/clk/imx/clk-pllv3.c +5 -1
+               return -EINVAL;
+
+       min_rate = parent_rate * 54 / 2;
+       max_rate = parent_rate * 108 / 2;
+
         if (rate < min_rate || rate > max_rate)
                 return -EINVAL;
 
--

adam

Quoted 2 lines

2.20.1

#4 lore raw

v2 cover fix pllv3 defects reported by Coverity

In reply to Adam Ford

V1->V2
* check only if parent_rate==0, as signalled by Adam

Giulio Benetti (3):
clk: imx: pllv3: fix potential 'divide by zero' in sys_get_rate()
clk: imx: pllv3: fix potential 'divide by zero' in av_get_rate()
clk: imx: pllv3: fix potential 'divide by zero' in av_set_rate()

 drivers/clk/imx/clk-pllv3.c | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)
Signature · 1 line
2.20.1
#5 lore raw

PATCH v2 1/3 clk: imx: pllv3: fix potential 'divide by zero' in sys_get_rate()

Guard 'parent_rate==0' to prevent 'divide by zero' issue in clk_pplv3_sys_get_rate(). If it is 0, let's return with -EINVAL.

---
V1->V2
* check only if parent_rate==0, as signalled by Adam

---
 drivers/clk/imx/clk-pllv3.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/clk/imx/clk-pllv3.c +8 -2
index fc16416d5f..a540a5b68c 100644
@@ -121,10 +121,16 @@ static ulong clk_pllv3_sys_set_rate(struct clk *clk, ulong rate)
 {
 	struct clk_pllv3 *pll = to_clk_pllv3(clk);
 	unsigned long parent_rate = clk_get_parent_rate(clk);
-	unsigned long min_rate = parent_rate * 54 / 2;
-	unsigned long max_rate = parent_rate * 108 / 2;
+	unsigned long min_rate;
+	unsigned long max_rate;
 	u32 val, div;
 
+	if (parent_rate == 0)
+		return -EINVAL;
+
+	min_rate = parent_rate * 54 / 2;
+	max_rate = parent_rate * 108 / 2;
+
 	if (rate < min_rate || rate > max_rate)
 		return -EINVAL;
 
Signature · 1 line
2.20.1
#6 lore raw

PATCH v2 2/3 clk: imx: pllv3: fix potential 'divide by zero' in av_get_rate()

In reply to Giulio Benetti

Guard 'mfd==0' to prevent 'divide by zero' issue in clk_pplv3_av_get_rate(). If it is 0, let's return with EIO since mfd should never be 0 at all.

---
V1->V2
* improved a little commit log

---
 drivers/clk/imx/clk-pllv3.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/clk/imx/clk-pllv3.c +3 -0
index a540a5b68c..72e6750615 100644
@@ -163,6 +163,9 @@ static ulong clk_pllv3_av_get_rate(struct clk *clk)
 	u32 div = readl(pll->base) & pll->div_mask;
 	u64 temp64 = (u64)parent_rate;
 
+	if (mfd == 0)
+		return -EIO;
+
 	temp64 *= mfn;
 	do_div(temp64, mfd);
 
Signature · 1 line
2.20.1
#7 lore raw

PATCH v2 3/3 clk: imx: pllv3: fix potential 'divide by zero' in av_set_rate()

In reply to Giulio Benetti

Guard 'parent_rate==0' to prevent 'divide by zero' issue in clk_pplv3_av_set_rate(). If it is 0, let's return with -EINVAL.

---
V1->V2
* check only if parent_rate==0, as signalled by Adam

---
 drivers/clk/imx/clk-pllv3.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/clk/imx/clk-pllv3.c +8 -2
index 72e6750615..0cdb9df45d 100644
@@ -176,13 +176,19 @@ static ulong clk_pllv3_av_set_rate(struct clk *clk, ulong rate)
 {
 	struct clk_pllv3 *pll = to_clk_pllv3(clk);
 	unsigned long parent_rate = clk_get_parent_rate(clk);
-	unsigned long min_rate = parent_rate * 27;
-	unsigned long max_rate = parent_rate * 54;
+	unsigned long min_rate;
+	unsigned long max_rate;
 	u32 val, div;
 	u32 mfn, mfd = 1000000;
 	u32 max_mfd = 0x3FFFFFFF;
 	u64 temp64;
 
+	if (parent_rate == 0)
+		return -EINVAL;
+
+	min_rate = parent_rate * 27;
+	max_rate = parent_rate * 54;
+
 	if (rate < min_rate || rate > max_rate)
 		return -EINVAL;
 
Signature · 1 line
2.20.1
#8 lore raw

v2 cover fix pllv3 defects reported by Coverity

In reply to Giulio Benetti
Quoted 11 lines · Giulio Benetti

V1->V2
* check only if parent_rate==0, as signalled by Adam

Giulio Benetti (3):
clk: imx: pllv3: fix potential 'divide by zero' in sys_get_rate()
clk: imx: pllv3: fix potential 'divide by zero' in av_get_rate()
clk: imx: pllv3: fix potential 'divide by zero' in av_set_rate()

  drivers/clk/imx/clk-pllv3.c | 23 +++++++++++++++++++----
  1 file changed, 19 insertions(+), 4 deletions(-)

Kindly ping

Signature · 2 lines
Giulio Benetti
Benetti Engineering sas
#9 lore raw

PATCH 2/3 clk: imx: pllv3: fix potential 'divide by zero' in av_get_rate()

In reply to Giulio Benetti

Guard 'mfd==0' to prevent 'divide by zero' issue in clk_pplv3_av_get_rate() and returning early with error EIO since mfd should never be 0 at all.

---
 drivers/clk/imx/clk-pllv3.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/clk/imx/clk-pllv3.c +3 -0
index 0d8e39cfbb..d2bb1e86e1 100644
@@ -163,6 +163,9 @@ static ulong clk_pllv3_av_get_rate(struct clk *clk)
 	u32 div = readl(pll->base) & pll->div_mask;
 	u64 temp64 = (u64)parent_rate;
 
+	if (mfd == 0)
+		return -EIO;
+
 	temp64 *= mfn;
 	do_div(temp64, mfd);
 
Signature · 1 line
2.20.1
#10 lore raw

PATCH 3/3 clk: imx: pllv3: fix potential 'divide by zero' in av_set_rate()

In reply to Giulio Benetti

Guard 'parent_rate==0' to prevent 'divide by zero' issue in clk_pplv3_av_set_rate(). Also, guard 'parent_rate<0' that would mean that clk_get_parent_rate() returned an error, so better to return early with error EINVAL.

---
 drivers/clk/imx/clk-pllv3.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/clk/imx/clk-pllv3.c +8 -2
index d2bb1e86e1..5383ef4816 100644
@@ -176,13 +176,19 @@ static ulong clk_pllv3_av_set_rate(struct clk *clk, ulong rate)
 {
 	struct clk_pllv3 *pll = to_clk_pllv3(clk);
 	unsigned long parent_rate = clk_get_parent_rate(clk);
-	unsigned long min_rate = parent_rate * 27;
-	unsigned long max_rate = parent_rate * 54;
+	unsigned long min_rate;
+	unsigned long max_rate;
 	u32 val, div;
 	u32 mfn, mfd = 1000000;
 	u32 max_mfd = 0x3FFFFFFF;
 	u64 temp64;
 
+	if (parent_rate <= 0)
+		return -EINVAL;
+
+	min_rate = parent_rate * 27;
+	max_rate = parent_rate * 54;
+
 	if (rate < min_rate || rate > max_rate)
 		return -EINVAL;
 
Signature · 1 line
2.20.1