]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ALSA: hdspm: Fix zero-division
authorTakashi Iwai <tiwai@suse.de>
Mon, 29 Feb 2016 13:32:42 +0000 (14:32 +0100)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 26 May 2016 22:45:36 +0000 (15:45 -0700)
Orabug: 23330988

[ Upstream commit c1099c3294c2344110085a38c50e478a5992b368 ]

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.

Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit 6177e82a6b6586a057e2f00940e2e220b993547e)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
sound/pci/rme9652/hdspm.c

index 67c90f0599257bfa74b29240459a320a664049ca..7f6190606f5e7308335672d93a0f4c11bae33c93 100644 (file)
@@ -1601,6 +1601,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)
@@ -2215,6 +2218,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;
                }
        }
 
@@ -2260,7 +2265,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;
 }