* [PATCH] staging: iio: frequency: ad9834: Validate frequency parameter value
@ 2024-07-03 10:47 Aleksandr Mishin
2024-07-03 13:29 ` Dan Carpenter
2024-07-03 15:45 ` [PATCH v2] " Aleksandr Mishin
0 siblings, 2 replies; 5+ messages in thread
From: Aleksandr Mishin @ 2024-07-03 10:47 UTC (permalink / raw)
To: Michael Hennerich
Cc: Aleksandr Mishin, Lars-Peter Clausen, Jonathan Cameron,
Greg Kroah-Hartman, Datta Shubhrajyoti, linux-iio, linux-staging,
linux-kernel, lvc-project
In ad9834_write_frequency() clk_get_rate() can return 0. In such case
ad9834_calc_freqreg() call will lead to division by zero. Checking
'if (fout > (clk_freq / 2))' doesn't protect in case of 'fout' is 0.
ad9834_write_frequency() is called from ad9834_write(), where fout is
taken from text buffer, which can contain any value.
Modify parameters checking.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
Fixes: 12b9d5bf76bf ("Staging: IIO: DDS: AD9833 / AD9834 driver")
Signed-off-by: Aleksandr Mishin <amishin@t-argos.ru>
---
drivers/staging/iio/frequency/ad9834.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/iio/frequency/ad9834.c b/drivers/staging/iio/frequency/ad9834.c
index a7a5cdcc6590..9e42129f44f7 100644
--- a/drivers/staging/iio/frequency/ad9834.c
+++ b/drivers/staging/iio/frequency/ad9834.c
@@ -114,7 +114,7 @@ static int ad9834_write_frequency(struct ad9834_state *st,
clk_freq = clk_get_rate(st->mclk);
- if (fout > (clk_freq / 2))
+ if (!fout || fout > (clk_freq / 2))
return -EINVAL;
regval = ad9834_calc_freqreg(clk_freq, fout);
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] staging: iio: frequency: ad9834: Validate frequency parameter value
2024-07-03 10:47 [PATCH] staging: iio: frequency: ad9834: Validate frequency parameter value Aleksandr Mishin
@ 2024-07-03 13:29 ` Dan Carpenter
2024-07-03 15:45 ` [PATCH v2] " Aleksandr Mishin
1 sibling, 0 replies; 5+ messages in thread
From: Dan Carpenter @ 2024-07-03 13:29 UTC (permalink / raw)
To: Aleksandr Mishin
Cc: Michael Hennerich, Lars-Peter Clausen, Jonathan Cameron,
Greg Kroah-Hartman, Datta Shubhrajyoti, linux-iio, linux-staging,
linux-kernel, lvc-project
On Wed, Jul 03, 2024 at 01:47:34PM +0300, Aleksandr Mishin wrote:
> In ad9834_write_frequency() clk_get_rate() can return 0. In such case
> ad9834_calc_freqreg() call will lead to division by zero. Checking
> 'if (fout > (clk_freq / 2))' doesn't protect in case of 'fout' is 0.
> ad9834_write_frequency() is called from ad9834_write(), where fout is
> taken from text buffer, which can contain any value.
>
> Modify parameters checking.
>
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
>
> Fixes: 12b9d5bf76bf ("Staging: IIO: DDS: AD9833 / AD9834 driver")
> Signed-off-by: Aleksandr Mishin <amishin@t-argos.ru>
> ---
> drivers/staging/iio/frequency/ad9834.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/iio/frequency/ad9834.c b/drivers/staging/iio/frequency/ad9834.c
> index a7a5cdcc6590..9e42129f44f7 100644
> --- a/drivers/staging/iio/frequency/ad9834.c
> +++ b/drivers/staging/iio/frequency/ad9834.c
> @@ -114,7 +114,7 @@ static int ad9834_write_frequency(struct ad9834_state *st,
>
> clk_freq = clk_get_rate(st->mclk);
>
> - if (fout > (clk_freq / 2))
> + if (!fout || fout > (clk_freq / 2))
So you don't want "clk_freq" to be zero so you check if "fout" can be
zero and do the algebra? That's a lot of acrobatics. Just check
if clk_freq == 0 directly.
regards,
dan carpenter
> return -EINVAL;
>
> regval = ad9834_calc_freqreg(clk_freq, fout);
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v2] staging: iio: frequency: ad9834: Validate frequency parameter value
2024-07-03 10:47 [PATCH] staging: iio: frequency: ad9834: Validate frequency parameter value Aleksandr Mishin
2024-07-03 13:29 ` Dan Carpenter
@ 2024-07-03 15:45 ` Aleksandr Mishin
2024-07-03 16:29 ` Dan Carpenter
1 sibling, 1 reply; 5+ messages in thread
From: Aleksandr Mishin @ 2024-07-03 15:45 UTC (permalink / raw)
To: Michael Hennerich
Cc: Aleksandr Mishin, Lars-Peter Clausen, Jonathan Cameron,
Greg Kroah-Hartman, Datta Shubhrajyoti, linux-iio, linux-staging,
linux-kernel, lvc-project, Dan Carpenter
In ad9834_write_frequency() clk_get_rate() can return 0. In such case
ad9834_calc_freqreg() call will lead to division by zero. Checking
'if (fout > (clk_freq / 2))' doesn't protect in case of 'fout' is 0.
ad9834_write_frequency() is called from ad9834_write(), where fout is
taken from text buffer, which can contain any value.
Modify parameters checking.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
Fixes: 12b9d5bf76bf ("Staging: IIO: DDS: AD9833 / AD9834 driver")
Suggested-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Aleksandr Mishin <amishin@t-argos.ru>
---
v1->v2: Check if clk_freq == 0 directly instead of fout == 0
as suggested by Dan
drivers/staging/iio/frequency/ad9834.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/iio/frequency/ad9834.c b/drivers/staging/iio/frequency/ad9834.c
index a7a5cdcc6590..47e7d7e6d920 100644
--- a/drivers/staging/iio/frequency/ad9834.c
+++ b/drivers/staging/iio/frequency/ad9834.c
@@ -114,7 +114,7 @@ static int ad9834_write_frequency(struct ad9834_state *st,
clk_freq = clk_get_rate(st->mclk);
- if (fout > (clk_freq / 2))
+ if (!clk_freq || fout > (clk_freq / 2))
return -EINVAL;
regval = ad9834_calc_freqreg(clk_freq, fout);
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2] staging: iio: frequency: ad9834: Validate frequency parameter value
2024-07-03 15:45 ` [PATCH v2] " Aleksandr Mishin
@ 2024-07-03 16:29 ` Dan Carpenter
2024-07-06 11:41 ` Jonathan Cameron
0 siblings, 1 reply; 5+ messages in thread
From: Dan Carpenter @ 2024-07-03 16:29 UTC (permalink / raw)
To: Aleksandr Mishin
Cc: Michael Hennerich, Lars-Peter Clausen, Jonathan Cameron,
Greg Kroah-Hartman, Datta Shubhrajyoti, linux-iio, linux-staging,
linux-kernel, lvc-project
On Wed, Jul 03, 2024 at 06:45:06PM +0300, Aleksandr Mishin wrote:
> In ad9834_write_frequency() clk_get_rate() can return 0. In such case
> ad9834_calc_freqreg() call will lead to division by zero. Checking
> 'if (fout > (clk_freq / 2))' doesn't protect in case of 'fout' is 0.
> ad9834_write_frequency() is called from ad9834_write(), where fout is
> taken from text buffer, which can contain any value.
>
> Modify parameters checking.
>
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
>
> Fixes: 12b9d5bf76bf ("Staging: IIO: DDS: AD9833 / AD9834 driver")
> Suggested-by: Dan Carpenter <dan.carpenter@linaro.org>
> Signed-off-by: Aleksandr Mishin <amishin@t-argos.ru>
> ---
> v1->v2: Check if clk_freq == 0 directly instead of fout == 0
> as suggested by Dan
Thanks!
Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org>
regards,
dan carpenter
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2] staging: iio: frequency: ad9834: Validate frequency parameter value
2024-07-03 16:29 ` Dan Carpenter
@ 2024-07-06 11:41 ` Jonathan Cameron
0 siblings, 0 replies; 5+ messages in thread
From: Jonathan Cameron @ 2024-07-06 11:41 UTC (permalink / raw)
To: Dan Carpenter
Cc: Aleksandr Mishin, Michael Hennerich, Lars-Peter Clausen,
Greg Kroah-Hartman, Datta Shubhrajyoti, linux-iio, linux-staging,
linux-kernel, lvc-project
On Wed, 3 Jul 2024 18:29:43 +0200
Dan Carpenter <dan.carpenter@linaro.org> wrote:
> On Wed, Jul 03, 2024 at 06:45:06PM +0300, Aleksandr Mishin wrote:
> > In ad9834_write_frequency() clk_get_rate() can return 0. In such case
> > ad9834_calc_freqreg() call will lead to division by zero. Checking
> > 'if (fout > (clk_freq / 2))' doesn't protect in case of 'fout' is 0.
> > ad9834_write_frequency() is called from ad9834_write(), where fout is
> > taken from text buffer, which can contain any value.
> >
> > Modify parameters checking.
> >
> > Found by Linux Verification Center (linuxtesting.org) with SVACE.
> >
> > Fixes: 12b9d5bf76bf ("Staging: IIO: DDS: AD9833 / AD9834 driver")
> > Suggested-by: Dan Carpenter <dan.carpenter@linaro.org>
> > Signed-off-by: Aleksandr Mishin <amishin@t-argos.ru>
> > ---
> > v1->v2: Check if clk_freq == 0 directly instead of fout == 0
> > as suggested by Dan
>
>
> Thanks!
>
> Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org>
>
Applied and marked for stable.
> regards,
> dan carpenter
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-07-06 11:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-03 10:47 [PATCH] staging: iio: frequency: ad9834: Validate frequency parameter value Aleksandr Mishin
2024-07-03 13:29 ` Dan Carpenter
2024-07-03 15:45 ` [PATCH v2] " Aleksandr Mishin
2024-07-03 16:29 ` Dan Carpenter
2024-07-06 11:41 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox