LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH][next] ASoC: cx2072x: fix integer overflow on unsigned int multiply
@ 2019-05-24 22:25 Colin King
  2019-05-25  6:25 ` Takashi Iwai
  2019-05-28 15:06 ` Applied "ASoC: cx2072x: fix integer overflow on unsigned int multiply" to the asoc tree Mark Brown
  0 siblings, 2 replies; 3+ messages in thread
From: Colin King @ 2019-05-24 22:25 UTC (permalink / raw)
  To: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai,
	Simon Ho, alsa-devel
  Cc: kernel-janitors, linux-kernel

From: Colin Ian King <colin.king@canonical.com>

In the case where frac_div larger than 96 the result of an unsigned
multiplication overflows an unsigned int.  For example, this can
happen when the sample_rate is 192000 and pll_input is 122.  Fix
this by casing the first term of the mutiply to a u64. Also remove
the extraneous parentheses around the expression.

Addresses-Coverity: ("Unintentional integer overflow")
Fixes: a497a4363706 ("ASoC: Add support for Conexant CX2072X CODEC")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 sound/soc/codecs/cx2072x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/codecs/cx2072x.c b/sound/soc/codecs/cx2072x.c
index c11a585bbf70..e8e6fd2e97b6 100644
--- a/sound/soc/codecs/cx2072x.c
+++ b/sound/soc/codecs/cx2072x.c
@@ -627,7 +627,7 @@ static int cx2072x_config_pll(struct cx2072x_priv *cx2072x)
 	if (frac_div) {
 		frac_div *= 1000;
 		frac_div /= pll_input;
-		frac_num = ((4000 + frac_div) * ((1 << 20) - 4));
+		frac_num = (u64)(4000 + frac_div) * ((1 << 20) - 4);
 		do_div(frac_num, 7);
 		frac = ((u32)frac_num + 499) / 1000;
 	}
-- 
2.20.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH][next] ASoC: cx2072x: fix integer overflow on unsigned int multiply
  2019-05-24 22:25 [PATCH][next] ASoC: cx2072x: fix integer overflow on unsigned int multiply Colin King
@ 2019-05-25  6:25 ` Takashi Iwai
  2019-05-28 15:06 ` Applied "ASoC: cx2072x: fix integer overflow on unsigned int multiply" to the asoc tree Mark Brown
  1 sibling, 0 replies; 3+ messages in thread
From: Takashi Iwai @ 2019-05-25  6:25 UTC (permalink / raw)
  To: Colin King
  Cc: alsa-devel, Liam Girdwood, Mark Brown, Jaroslav Kysela,
	kernel-janitors, linux-kernel

On Sat, 25 May 2019 00:25:51 +0200,
Colin King wrote:
> 
> From: Colin Ian King <colin.king@canonical.com>
> 
> In the case where frac_div larger than 96 the result of an unsigned
> multiplication overflows an unsigned int.  For example, this can
> happen when the sample_rate is 192000 and pll_input is 122.  Fix
> this by casing the first term of the mutiply to a u64. Also remove
> the extraneous parentheses around the expression.
> 
> Addresses-Coverity: ("Unintentional integer overflow")
> Fixes: a497a4363706 ("ASoC: Add support for Conexant CX2072X CODEC")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Reviewed-by: Takashi Iwai <tiwai@suse.de>


thanks,

Takashi

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Applied "ASoC: cx2072x: fix integer overflow on unsigned int multiply" to the asoc tree
  2019-05-24 22:25 [PATCH][next] ASoC: cx2072x: fix integer overflow on unsigned int multiply Colin King
  2019-05-25  6:25 ` Takashi Iwai
@ 2019-05-28 15:06 ` Mark Brown
  1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2019-05-28 15:06 UTC (permalink / raw)
  To: Colin Ian King
  Cc: alsa-devel, Jaroslav Kysela, kernel-janitors, Liam Girdwood,
	linux-kernel, Mark Brown, Simon Ho, Takashi Iwai

The patch

   ASoC: cx2072x: fix integer overflow on unsigned int multiply

has been applied to the asoc tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.3

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

From be0461048b60066eaba9046178fb96e78579af21 Mon Sep 17 00:00:00 2001
From: Colin Ian King <colin.king@canonical.com>
Date: Fri, 24 May 2019 23:25:51 +0100
Subject: [PATCH] ASoC: cx2072x: fix integer overflow on unsigned int multiply

In the case where frac_div larger than 96 the result of an unsigned
multiplication overflows an unsigned int.  For example, this can
happen when the sample_rate is 192000 and pll_input is 122.  Fix
this by casing the first term of the mutiply to a u64. Also remove
the extraneous parentheses around the expression.

Addresses-Coverity: ("Unintentional integer overflow")
Fixes: a497a4363706 ("ASoC: Add support for Conexant CX2072X CODEC")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/codecs/cx2072x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/codecs/cx2072x.c b/sound/soc/codecs/cx2072x.c
index c11a585bbf70..ed762546eaee 100644
--- a/sound/soc/codecs/cx2072x.c
+++ b/sound/soc/codecs/cx2072x.c
@@ -627,7 +627,7 @@ static int cx2072x_config_pll(struct cx2072x_priv *cx2072x)
 	if (frac_div) {
 		frac_div *= 1000;
 		frac_div /= pll_input;
-		frac_num = ((4000 + frac_div) * ((1 << 20) - 4));
+		frac_num = (u64)(4000 + frac_div) * ((1 << 20) - 4);
 		do_div(frac_num, 7);
 		frac = ((u32)frac_num + 499) / 1000;
 	}
-- 
2.20.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-05-28 15:07 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-24 22:25 [PATCH][next] ASoC: cx2072x: fix integer overflow on unsigned int multiply Colin King
2019-05-25  6:25 ` Takashi Iwai
2019-05-28 15:06 ` Applied "ASoC: cx2072x: fix integer overflow on unsigned int multiply" to the asoc tree Mark Brown

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).