Home » Mailing list archives » linux-kernel » 2008 » April » 16

[PATCH 6/6] sound/drivers/dummy.c: fix negative snd_pcm_format_width() check

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Roel Kluin <12o3l@...>
To: <perex@...>
Cc: <alsa-devel@...>, lkml <linux-kernel@...>
Subject: [PATCH 6/6] sound/drivers/dummy.c: fix negative snd_pcm_format_width() check
Date: Wednesday, April 16, 2008 - 12:20 pm

bps is unsigned, a negative snd_pcm_format_width() return value is not noticed
    
Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
---
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index a240eae..1c88977 100644
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -230,13 +230,14 @@ static int snd_card_dummy_pcm_prepare(struct snd_pcm_substream *substream)
 {
 	struct snd_pcm_runtime *runtime = substream->runtime;
 	struct snd_dummy_pcm *dpcm = runtime->private_data;
-	unsigned int bps;
+	int bps;
+
+	bps = snd_pcm_format_width(runtime->format) * runtime->rate *
+		runtime->channels / 8;
 
-	bps = runtime->rate * runtime->channels;
-	bps *= snd_pcm_format_width(runtime->format);
-	bps /= 8;
 	if (bps <= 0)
 		return -EINVAL;
+
 	dpcm->pcm_bps = bps;
 	dpcm->pcm_jiffie = bps / HZ;
 	dpcm->pcm_size = snd_pcm_lib_buffer_bytes(substream);
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 1/6] MIPS: irixelf: fix test unsigned var &lt; 0, Roel Kluin, (Tue Apr 15, 9:39 pm)
Re: [PATCH 1/6] MIPS: irixelf: fix test unsigned var &lt; 0, Marcin Slusarz, (Wed Apr 16, 3:39 pm)
Re: [PATCH 1/6] MIPS: irixelf: fix test unsigned var &lt; 0, Ralf Baechle, (Wed Apr 16, 2:00 pm)
[PATCH 6/6] sound/drivers/dummy.c: fix negative snd_pcm_form..., Roel Kluin, (Wed Apr 16, 12:20 pm)
Re: [alsa-devel] [PATCH 6/6] sound/drivers/dummy.c: fix nega..., Takashi Iwai, (Wed Apr 16, 12:31 pm)
[PATCH 5/6] NETFILTER: signed tcphoff for ipv6_skip_exthdr()..., Roel Kluin, (Wed Apr 16, 12:00 pm)
Re: [netfilter-core] [PATCH 5/6] NETFILTER: signed tcphoff f..., Patrick McHardy, (Mon Apr 21, 8:24 am)
Re: [PATCH 1/6] MIPS: irixelf: fix test unsigned var &lt; 0, Roel Kluin, (Wed Apr 16, 11:27 am)
[PATCH 4/6] RTC: rtc-ds1374: fix unsigned new_alarm test, Roel Kluin, (Wed Apr 16, 11:32 am)
Re: [PATCH 4/6] RTC: rtc-ds1374: fix unsigned new_alarm test, Alessandro Zummo, (Fri Apr 18, 5:58 pm)