Skip to contentSkip to conversation

Fix gus_pcm dereference before NULL

PATCH Eugene Teo 4 participants 5 messages Mar 16, 2006 Sound

lore
Share & tools
lore

Eugene Teo

author
#0 lore raw

substream is dereferenced before checking for NULL.

Coverity bug #861

sound/isa/gus/gus_pcm.c renamed from sound/isa/gus/gus_pcm.c~ +5 -3
@@ -103,8 +103,8 @@
 
 static void snd_gf1_pcm_trigger_up(struct snd_pcm_substream *substream)
 {
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	struct gus_pcm_private *pcmp = runtime->private_data;
+	struct snd_pcm_runtime *runtime;
+	struct gus_pcm_private *pcmp;
 	struct snd_gus_card * gus = pcmp->gus;
 	unsigned long flags;
 	unsigned char voice_ctrl, ramp_ctrl;
@@ -114,8 +114,10 @@
 	unsigned char pan;
 	unsigned int voice;
 
-	if (substream == NULL)
+	if (substream == NULL || substream->runtime == NULL)
 		return;
+	runtime = substream->runtime;
+	pcmp = runtime->private_data;
 	spin_lock_irqsave(&pcmp->lock, flags);
 	if (pcmp->flags & SNDRV_GF1_PCM_PFLG_ACTIVE) {
 		spin_unlock_irqrestore(&pcmp->lock, flags);
Signature · 2 lines
1024D/A6D12F80 print D51D 2633 8DAC 04DB 7265  9BB8 5883 6DAA A6D1 2F80
main(i) { putchar(182623909 >> (i-1) * 5&31|!!(i<7)<<6) && main(++i); }
#1 lore raw

sound/isa/gus/gus_pcm.c

Quoted 9 lines · On Thu, 16 Mar 2006 10:00:07 +0800 Eugene Teo wrote:

substream is dereferenced before checking for NULL.

Coverity bug #861

sound/isa/gus/gus_pcm.c renamed from sound/isa/gus/gus_pcm.c~ +0 -0
@@ -103,8 +103,8 @@

BTW, please use "-p" diff option so that the "@@" sections include function or struct names etc. I.e., be nice to patch readers/reviewers. :)

---
~Randy

#2 lore raw
Quoted 5 lines

BTW, please use "-p" diff option so that the "@@" sections include function or struct names etc. I.e., be nice to patch readers/reviewers. :)

Talking of diff flags, how about adding -d? Does not cost too much.

Jan Engelhardt

#3 lore raw
In reply to Eugene Teo

At Thu, 16 Mar 2006 10:00:07 +0800,

Quoted 2 lines · Eugene Teo

substream is dereferenced before checking for NULL.

The NULL check of substream is simply superfluous. It is guaranteed to receive non-NULL substream and substream->runtime.

Takashi

Quoted 41 lines

Coverity bug #861

sound/isa/gus/gus_pcm.c renamed from sound/isa/gus/gus_pcm.c~ +5 -3
@@ -103,8 +103,8 @@
 
 static void snd_gf1_pcm_trigger_up(struct snd_pcm_substream *substream)
 {
-	struct snd_pcm_runtime *runtime = substream->runtime;
-	struct gus_pcm_private *pcmp = runtime->private_data;
+	struct snd_pcm_runtime *runtime;
+	struct gus_pcm_private *pcmp;
 	struct snd_gus_card * gus = pcmp->gus;
 	unsigned long flags;
 	unsigned char voice_ctrl, ramp_ctrl;
@@ -114,8 +114,10 @@
 	unsigned char pan;
 	unsigned int voice;
 
-	if (substream == NULL)
+	if (substream == NULL || substream->runtime == NULL)
 		return;
+	runtime = substream->runtime;
+	pcmp = runtime->private_data;
 	spin_lock_irqsave(&pcmp->lock, flags);
 	if (pcmp->flags & SNDRV_GF1_PCM_PFLG_ACTIVE) {
 		spin_unlock_irqrestore(&pcmp->lock, flags);
Signature · 9 lines
-- 
1024D/A6D12F80 print D51D 2633 8DAC 04DB 7265  9BB8 5883 6DAA A6D1 2F80
main(i) { putchar(182623909 >> (i-1) * 5&31|!!(i<7)<<6) && main(++i); }

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
author
#4 lore raw

<quote sender="Takashi Iwai">

Quoted 12 lines

At Thu, 16 Mar 2006 10:00:07 +0800,

Quoted 2 lines · Eugene Teo

substream is dereferenced before checking for NULL.

The NULL check of substream is simply superfluous. It is guaranteed to receive non-NULL substream and substream->runtime.

Quoted 4 lines

Coverity bug #861

Resend.

Eugene

--
The NULL check of substream is simply superfluous. It is guaranteed to receive non-NULL substream. Thanks Takashi.

Coverity bug #861

sound/isa/gus/gus_pcm.c renamed from sound/isa/gus/gus_pcm.c~ +0 -2
@@ -114,8 +114,6 @@ static void snd_gf1_pcm_trigger_up(struc
 	unsigned char pan;
 	unsigned int voice;
 
-	if (substream == NULL)
-		return;
 	spin_lock_irqsave(&pcmp->lock, flags);
 	if (pcmp->flags & SNDRV_GF1_PCM_PFLG_ACTIVE) {
 		spin_unlock_irqrestore(&pcmp->lock, flags);
Signature · 2 lines
1024D/A6D12F80 print D51D 2633 8DAC 04DB 7265  9BB8 5883 6DAA A6D1 2F80
main(i) { putchar(182623909 >> (i-1) * 5&31|!!(i<7)<<6) && main(++i); }