ALSA: hwdep: silence integer overflow warning
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 28 Oct 2011 06:46:01 +0000 (09:46 +0300)
committerTakashi Iwai <tiwai@suse.de>
Mon, 31 Oct 2011 08:52:43 +0000 (09:52 +0100)
Smatch complains that if device is INT_MAX then device + 1 can
overflow.  It just means we would have an annoying loop while we
check all the devices from -2147483648 to SNDRV_MINOR_HWDEPS.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/core/hwdep.c

index a70ee7f1ed9832ed3ef3b4463376786dd2500234..031e215b6ddeb0fb5f16acfdbbe33b6500dd984b 100644 (file)
@@ -272,7 +272,14 @@ static int snd_hwdep_control_ioctl(struct snd_card *card,
                        if (get_user(device, (int __user *)arg))
                                return -EFAULT;
                        mutex_lock(&register_mutex);
-                       device = device < 0 ? 0 : device + 1;
+
+                       if (device < 0)
+                               device = 0;
+                       else if (device < SNDRV_MINOR_HWDEPS)
+                               device++;
+                       else
+                               device = SNDRV_MINOR_HWDEPS;
+
                        while (device < SNDRV_MINOR_HWDEPS) {
                                if (snd_hwdep_search(card, device))
                                        break;