Skip to contentSkip to conversation

alsa: fix comparison of unsigned < 0

PATCH In review Bill Nottingham 3 participants 4 messages May 30, 2007 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 alsa: fix comparison of unsigned < 0

Recent gccs emit warnings when unsigned variables are compared < 0 or >= 0.

 ac97/ac97_patch.c    |    3 +--
 ali5451/ali5451.c    |    6 ++----
 ca0106/ca0106_proc.c |    4 ++--
 rme9652/rme9652.c    |    2 --
 4 files changed, 5 insertions(+), 10 deletions(-)
sound/pci/ac97/ac97_patch.c +1 -2
diff -ru linux-2.6.21-old/sound/pci/ac97/ac97_patch.c linux-2.6.21/sound/pci/ac97/ac97_patch.c
@@ -2086,8 +2086,7 @@
 	struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
 	unsigned short val;
 
-	if (ucontrol->value.enumerated.item[0] > 3
-	    || ucontrol->value.enumerated.item[0] < 0)
+	if (ucontrol->value.enumerated.item[0] > 3)
 		return -EINVAL;
 	val = ctrl2reg[ucontrol->value.enumerated.item[0]]
 	      << AC97_AD198X_VREF_SHIFT;
sound/pci/ali5451/ali5451.c +2 -4
diff -ru linux-2.6.21-old/sound/pci/ali5451/ali5451.c linux-2.6.21/sound/pci/ali5451/ali5451.c
@@ -2057,10 +2057,8 @@
 {
 	if (codec->hw_initialized)
 		snd_ali_disable_address_interrupt(codec);
-	if (codec->irq >= 0) {
-		synchronize_irq(codec->irq);
-		free_irq(codec->irq, codec);
-	}
+	synchronize_irq(codec->irq);
+	free_irq(codec->irq, codec);
 	if (codec->port)
 		pci_release_regions(codec->pci);
 	pci_disable_device(codec->pci);
sound/pci/ca0106/ca0106_proc.c +2 -2
diff -ru linux-2.6.21-old/sound/pci/ca0106/ca0106_proc.c linux-2.6.21/sound/pci/ca0106/ca0106_proc.c
@@ -305,7 +305,7 @@
         while (!snd_info_get_line(buffer, line, sizeof(line))) {
                 if (sscanf(line, "%x %x", &reg, &val) != 2)
                         continue;
-                if ((reg < 0x40) && (reg >=0) && (val <= 0xffffffff) ) {
+                if ((reg < 0x40) && (val <= 0xffffffff) ) {
 			spin_lock_irqsave(&emu->emu_lock, flags);
 			outl(val, emu->port + (reg & 0xfffffffc));
 			spin_unlock_irqrestore(&emu->emu_lock, flags);
@@ -406,7 +406,7 @@
         while (!snd_info_get_line(buffer, line, sizeof(line))) {
                 if (sscanf(line, "%x %x %x", &reg, &channel_id, &val) != 3)
                         continue;
-                if ((reg < 0x80) && (reg >=0) && (val <= 0xffffffff) && (channel_id >=0) && (channel_id <= 3) )
+                if ((reg < 0x80) && (val <= 0xffffffff) && (channel_id <= 3) )
                         snd_ca0106_ptr_write(emu, reg, channel_id, val);
         }
 }
sound/pci/rme9652/rme9652.c +0 -2
diff -ru linux-2.6.21-old/sound/pci/rme9652/rme9652.c linux-2.6.21/sound/pci/rme9652/rme9652.c
@@ -406,8 +406,6 @@
 		} else if (!frag)
 			return 0;
 		offset -= rme9652->max_jitter;
-		if (offset < 0)
-			offset += period_size * 2;
 	} else {
 		if (offset > period_size + rme9652->max_jitter) {
 			if (!frag)
#1 lore raw

Hi,

thanks for checking this.
They seem actually hitting some real bugs.

At Wed, 30 May 2007 03:35:54 -0400,

Quoted 5 lines · Bill Nottingham

diff -ru linux-2.6.21-old/sound/pci/ac97/ac97_patch.c linux-2.6.21/sound/pci/ac97/ac97_patch.c

sound/pci/ac97/ac97_patch.c line 2092

Quoted 9 lines
sound/pci/ac97/ac97_patch.c +1 -2
@@ -2086,8 +2086,7 @@
 	struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
 	unsigned short val;
 
-	if (ucontrol->value.enumerated.item[0] > 3
-	    || ucontrol->value.enumerated.item[0] < 0)
+	if (ucontrol->value.enumerated.item[0] > 3)
 		return -EINVAL;
 	val = ctrl2reg[ucontrol->value.enumerated.item[0]]
 	      << AC97_AD198X_VREF_SHIFT;

This one is fine.

Quoted 6 lines

diff -ru linux-2.6.21-old/sound/pci/ali5451/ali5451.c linux-2.6.21/sound/pci/ali5451/ali5451.c

sound/pci/ali5451/ali5451.c +0 -0
@@ -2057,10 +2057,8 @@
 {
 	if (codec->hw_initialized)

sound/pci/ali5451/ali5451.c line 2064

Quoted 10 lines
sound/pci/ali5451/ali5451.c +2 -4
 		snd_ali_disable_address_interrupt(codec);
-	if (codec->irq >= 0) {
-		synchronize_irq(codec->irq);
-		free_irq(codec->irq, codec);
-	}
+	synchronize_irq(codec->irq);
+	free_irq(codec->irq, codec);
 	if (codec->port)
 		pci_release_regions(codec->pci);
 	pci_disable_device(codec->pci);

Bah, the check isn't wrong but the type of codec->irq. It should be int instead of unsigned long. I'll fix it.

sound/pci/ca0106/ca0106_proc.c line 308

Quoted 9 lines

diff -ru linux-2.6.21-old/sound/pci/ca0106/ca0106_proc.c linux-2.6.21/sound/pci/ca0106/ca0106_proc.c

sound/pci/ca0106/ca0106_proc.c +1 -1
@@ -305,7 +305,7 @@
         while (!snd_info_get_line(buffer, line, sizeof(line))) {
                 if (sscanf(line, "%x %x", &reg, &val) != 2)
                         continue;
-                if ((reg < 0x40) && (reg >=0) && (val <= 0xffffffff) ) {
+                if ((reg < 0x40) && (val <= 0xffffffff) ) {

It's a 32bit unsigned int, so the check of 0xffffffff isn't needed, too.

sound/pci/ca0106/ca0106_proc.c line 412

Quoted 12 lines
sound/pci/ca0106/ca0106_proc.c +1 -1
 			spin_lock_irqsave(&emu->emu_lock, flags);
 			outl(val, emu->port + (reg & 0xfffffffc));
 			spin_unlock_irqrestore(&emu->emu_lock, flags);
@@ -406,7 +406,7 @@
         while (!snd_info_get_line(buffer, line, sizeof(line))) {
                 if (sscanf(line, "%x %x %x", &reg, &channel_id, &val) != 3)
                         continue;
-                if ((reg < 0x80) && (reg >=0) && (val <= 0xffffffff) && (channel_id >=0) && (channel_id <= 3) )
+                if ((reg < 0x80) && (val <= 0xffffffff) && (channel_id <= 3) )
                         snd_ca0106_ptr_write(emu, reg, channel_id, val);
         }
 }

Ditto.

sound/pci/rme9652/rme9652.c line 410

Quoted 9 lines

diff -ru linux-2.6.21-old/sound/pci/rme9652/rme9652.c linux-2.6.21/sound/pci/rme9652/rme9652.c

sound/pci/rme9652/rme9652.c +0 -2
@@ -406,8 +406,6 @@
 		} else if (!frag)
 			return 0;
 		offset -= rme9652->max_jitter;
-		if (offset < 0)
-			offset += period_size * 2;

I think this check is actually needed, but it must be cast to int. Will fix this, too.

Takashi

#2 lore raw

Takashi Iwai napsal(a):

Quoted 4 lines

Hi,

thanks for checking this.
They seem actually hitting some real bugs.

Bug fixes are ok, but keep on your mind this (I haven't checked if this is the case):
http://lkml.org/lkml/2006/11/28/206

Quoted 9 lines

At Wed, 30 May 2007 03:35:54 -0400,

Quoted 7 lines · Bill Nottingham

diff -ru linux-2.6.21-old/sound/pci/ac97/ac97_patch.c linux-2.6.21/sound/pci/ac97/ac97_patch.c

sound/pci/ac97/ac97_patch.c +0 -0
@@ -2086,8 +2086,7 @@
 	struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
 	unsigned short val;
 
Quoted 8 lines

sound/pci/ac97/ac97_patch.c line 2092

Quoted 6 lines
sound/pci/ac97/ac97_patch.c +1 -2
-	if (ucontrol->value.enumerated.item[0] > 3
-	    || ucontrol->value.enumerated.item[0] < 0)
+	if (ucontrol->value.enumerated.item[0] > 3)
 		return -EINVAL;
 	val = ctrl2reg[ucontrol->value.enumerated.item[0]]
 	      << AC97_AD198X_VREF_SHIFT;

This one is fine.

[...]

regards,

Signature · 4 lines
http://www.fi.muni.cz/~xslaby/            Jiri Slaby
faculty of informatics, masaryk university, brno, cz
e-mail: jirislaby gmail com, gpg pubkey fingerprint:
 B674 9967 0407 CE62 ACC8  22A0 32CC 55C3 39D4 7A7E
#3 lore raw

At Wed, 30 May 2007 13:47:44 +0200,

Quoted 10 lines · Jiri Slaby

Takashi Iwai napsal(a):

Quoted 4 lines

Hi,

thanks for checking this.
They seem actually hitting some real bugs.

Bug fixes are ok, but keep on your mind this (I haven't checked if this is the case):
http://lkml.org/lkml/2006/11/28/206

Yep, I already committed real bugfixes but didn't apply the rest.

thanks,

Takashi

Quoted 27 lines
Quoted 10 lines

At Wed, 30 May 2007 03:35:54 -0400,

Quoted 7 lines · Bill Nottingham

diff -ru linux-2.6.21-old/sound/pci/ac97/ac97_patch.c linux-2.6.21/sound/pci/ac97/ac97_patch.c

sound/pci/ac97/ac97_patch.c +0 -0
@@ -2086,8 +2086,7 @@
 	struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
 	unsigned short val;
 
Quoted 8 lines

sound/pci/ac97/ac97_patch.c line 2092

Quoted 6 lines
sound/pci/ac97/ac97_patch.c +1 -2
-	if (ucontrol->value.enumerated.item[0] > 3
-	    || ucontrol->value.enumerated.item[0] < 0)
+	if (ucontrol->value.enumerated.item[0] > 3)
 		return -EINVAL;
 	val = ctrl2reg[ucontrol->value.enumerated.item[0]]
 	      << AC97_AD198X_VREF_SHIFT;

This one is fine.

[...]

regards,

Signature · 4 lines
http://www.fi.muni.cz/~xslaby/            Jiri Slaby
faculty of informatics, masaryk university, brno, cz
e-mail: jirislaby gmail com, gpg pubkey fingerprint:
 B674 9967 0407 CE62 ACC8  22A0 32CC 55C3 39D4 7A7E