Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ALSA: synth: emux: soundfont.c: divide by zero in calc_gus_envelope_time()
@ 2019-05-06 12:51 Dan Carpenter
  2019-05-06 13:01 ` Takashi Iwai
  0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2019-05-06 12:51 UTC (permalink / raw)
  To: Jaroslav Kysela; +Cc: alsa-devel, kernel-janitors, Takashi Iwai

This function is called from load_guspatch() and the rate is specified
by the user.  If they accidentally selected zero then it would crash the
kernel.  I've just changed the zero to a one.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 sound/synth/emux/soundfont.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sound/synth/emux/soundfont.c b/sound/synth/emux/soundfont.c
index 31a4ea94830e..9b5d70104489 100644
--- a/sound/synth/emux/soundfont.c
+++ b/sound/synth/emux/soundfont.c
@@ -856,6 +856,8 @@ calc_gus_envelope_time(int rate, int start, int end)
 	int r, p, t;
 	r = (3 - ((rate >> 6) & 3)) * 3;
 	p = rate & 0x3f;
+	if (!p)
+		p = 1;
 	t = end - start;
 	if (t < 0) t = -t;
 	if (13 > r)
-- 
2.18.0

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

* Re: [PATCH] ALSA: synth: emux: soundfont.c: divide by zero in calc_gus_envelope_time()
  2019-05-06 12:51 [PATCH] ALSA: synth: emux: soundfont.c: divide by zero in calc_gus_envelope_time() Dan Carpenter
@ 2019-05-06 13:01 ` Takashi Iwai
  0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2019-05-06 13:01 UTC (permalink / raw)
  To: Dan Carpenter; +Cc: alsa-devel, kernel-janitors

On Mon, 06 May 2019 14:51:19 +0200,
Dan Carpenter wrote:
> 
> This function is called from load_guspatch() and the rate is specified
> by the user.  If they accidentally selected zero then it would crash the
> kernel.  I've just changed the zero to a one.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Thanks, applied now.


Takashi

> ---
>  sound/synth/emux/soundfont.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/sound/synth/emux/soundfont.c b/sound/synth/emux/soundfont.c
> index 31a4ea94830e..9b5d70104489 100644
> --- a/sound/synth/emux/soundfont.c
> +++ b/sound/synth/emux/soundfont.c
> @@ -856,6 +856,8 @@ calc_gus_envelope_time(int rate, int start, int end)
>  	int r, p, t;
>  	r = (3 - ((rate >> 6) & 3)) * 3;
>  	p = rate & 0x3f;
> +	if (!p)
> +		p = 1;
>  	t = end - start;
>  	if (t < 0) t = -t;
>  	if (13 > r)
> -- 
> 2.18.0
> 
> 

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

end of thread, other threads:[~2019-05-06 13:01 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-06 12:51 [PATCH] ALSA: synth: emux: soundfont.c: divide by zero in calc_gus_envelope_time() Dan Carpenter
2019-05-06 13:01 ` Takashi Iwai

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox