]> git.hungrycats.org Git - linux/commitdiff
ALSA: hdspm: Fix zero-division
authorTakashi Iwai <tiwai@suse.de>
Mon, 29 Feb 2016 13:32:42 +0000 (14:32 +0100)
committerJiri Slaby <jslaby@suse.cz>
Mon, 7 Mar 2016 15:05:26 +0000 (16:05 +0100)
commit c1099c3294c2344110085a38c50e478a5992b368 upstream.

HDSPM driver contains a code issuing zero-division potentially in
system sample rate ctl code.  This patch fixes it by not processing
a zero or invalid rate value as a divisor, as well as excluding the
invalid value to be passed via the given ctl element.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
sound/pci/rme9652/hdspm.c

index fd72c7226a365cd16b560d854f6823cb4c649855..2f5565be9347e5b9e2c12a9d063b3f657859feae 100644 (file)
@@ -1602,6 +1602,9 @@ static void hdspm_set_dds_value(struct hdspm *hdspm, int rate)
 {
        u64 n;
 
+       if (snd_BUG_ON(rate <= 0))
+               return;
+
        if (rate >= 112000)
                rate /= 4;
        else if (rate >= 56000)
@@ -2224,6 +2227,8 @@ static int hdspm_get_system_sample_rate(struct hdspm *hdspm)
                } else {
                        /* slave mode, return external sample rate */
                        rate = hdspm_external_sample_rate(hdspm);
+                       if (!rate)
+                               rate = hdspm->system_sample_rate;
                }
        }
 
@@ -2269,7 +2274,10 @@ static int snd_hdspm_put_system_sample_rate(struct snd_kcontrol *kcontrol,
                                            ucontrol)
 {
        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+       int rate = ucontrol->value.integer.value[0];
 
+       if (rate < 27000 || rate > 207000)
+               return -EINVAL;
        hdspm_set_dds_value(hdspm, ucontrol->value.integer.value[0]);
        return 0;
 }