Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=498ade1a133dffd0f3ee90952737045d56e6689a
Commit:     498ade1a133dffd0f3ee90952737045d56e6689a
Parent:     02ff1324930675599694bb1285afc4341f98a7a1
Author:     Takashi Iwai <[EMAIL PROTECTED]>
AuthorDate: Thu Nov 15 16:16:32 2007 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Thu Jan 31 17:29:25 2008 +0100

    [ALSA] aoa - Check value range in ctl callbacks
    
    Check the value ranges in ctl put callbacks properly in aoa drivers.
    
    Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
    Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/aoa/codecs/snd-aoa-codec-onyx.c     |   12 ++++++++++++
 sound/aoa/codecs/snd-aoa-codec-tas.c      |   21 ++++++++++++++++++++-
 sound/aoa/fabrics/snd-aoa-fabric-layout.c |    2 +-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/sound/aoa/codecs/snd-aoa-codec-onyx.c 
b/sound/aoa/codecs/snd-aoa-codec-onyx.c
index 71e3f93..6a3837d 100644
--- a/sound/aoa/codecs/snd-aoa-codec-onyx.c
+++ b/sound/aoa/codecs/snd-aoa-codec-onyx.c
@@ -138,6 +138,13 @@ static int onyx_snd_vol_put(struct snd_kcontrol *kcontrol,
        struct onyx *onyx = snd_kcontrol_chip(kcontrol);
        s8 l, r;
 
+       if (ucontrol->value.integer.value[0] < -128 + VOLUME_RANGE_SHIFT ||
+           ucontrol->value.integer.value[0] > -1 + VOLUME_RANGE_SHIFT)
+               return -EINVAL;
+       if (ucontrol->value.integer.value[1] < -128 + VOLUME_RANGE_SHIFT ||
+           ucontrol->value.integer.value[1] > -1 + VOLUME_RANGE_SHIFT)
+               return -EINVAL;
+
        mutex_lock(&onyx->mutex);
        onyx_read_register(onyx, ONYX_REG_DAC_ATTEN_LEFT, &l);
        onyx_read_register(onyx, ONYX_REG_DAC_ATTEN_RIGHT, &r);
@@ -206,6 +213,9 @@ static int onyx_snd_inputgain_put(struct snd_kcontrol 
*kcontrol,
        struct onyx *onyx = snd_kcontrol_chip(kcontrol);
        u8 v, n;
 
+       if (ucontrol->value.integer.value[0] < 3 + INPUTGAIN_RANGE_SHIFT ||
+           ucontrol->value.integer.value[0] > 28 + INPUTGAIN_RANGE_SHIFT)
+               return -EINVAL;
        mutex_lock(&onyx->mutex);
        onyx_read_register(onyx, ONYX_REG_ADC_CONTROL, &v);
        n = v;
@@ -272,6 +282,8 @@ static void onyx_set_capture_source(struct onyx *onyx, int 
mic)
 static int onyx_snd_capture_source_put(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol)
 {
+       if (ucontrol->value.enumerated.item[0] > 1)
+               return -EINVAL;
        onyx_set_capture_source(snd_kcontrol_chip(kcontrol),
                                ucontrol->value.enumerated.item[0]);
        return 1;
diff --git a/sound/aoa/codecs/snd-aoa-codec-tas.c 
b/sound/aoa/codecs/snd-aoa-codec-tas.c
index 70c3416..7a16a33 100644
--- a/sound/aoa/codecs/snd-aoa-codec-tas.c
+++ b/sound/aoa/codecs/snd-aoa-codec-tas.c
@@ -248,6 +248,13 @@ static int tas_snd_vol_put(struct snd_kcontrol *kcontrol,
 {
        struct tas *tas = snd_kcontrol_chip(kcontrol);
 
+       if (ucontrol->value.integer.value[0] < 0 ||
+           ucontrol->value.integer.value[0] > 177)
+               return -EINVAL;
+       if (ucontrol->value.integer.value[1] < 0 ||
+           ucontrol->value.integer.value[1] > 177)
+               return -EINVAL;
+
        mutex_lock(&tas->mtx);
        if (tas->cached_volume_l == ucontrol->value.integer.value[0]
         && tas->cached_volume_r == ucontrol->value.integer.value[1]) {
@@ -401,6 +408,10 @@ static int tas_snd_drc_range_put(struct snd_kcontrol 
*kcontrol,
 {
        struct tas *tas = snd_kcontrol_chip(kcontrol);
 
+       if (ucontrol->value.integer.value[0] < 0 ||
+           ucontrol->value.integer.value[0] > TAS3004_DRC_MAX)
+               return -EINVAL;
+
        mutex_lock(&tas->mtx);
        if (tas->drc_range == ucontrol->value.integer.value[0]) {
                mutex_unlock(&tas->mtx);
@@ -447,7 +458,7 @@ static int tas_snd_drc_switch_put(struct snd_kcontrol 
*kcontrol,
                return 0;
        }
 
-       tas->drc_enabled = ucontrol->value.integer.value[0];
+       tas->drc_enabled = !!ucontrol->value.integer.value[0];
        if (tas->hw_enabled)
                tas3004_set_drc(tas);
        mutex_unlock(&tas->mtx);
@@ -494,6 +505,8 @@ static int tas_snd_capture_source_put(struct snd_kcontrol 
*kcontrol,
        struct tas *tas = snd_kcontrol_chip(kcontrol);
        int oldacr;
 
+       if (ucontrol->value.enumerated.item[0] > 1)
+               return -EINVAL;
        mutex_lock(&tas->mtx);
        oldacr = tas->acr;
 
@@ -562,6 +575,9 @@ static int tas_snd_treble_put(struct snd_kcontrol *kcontrol,
 {
        struct tas *tas = snd_kcontrol_chip(kcontrol);
 
+       if (ucontrol->value.integer.value[0] < TAS3004_TREBLE_MIN ||
+           ucontrol->value.integer.value[0] > TAS3004_TREBLE_MAX)
+               return -EINVAL;
        mutex_lock(&tas->mtx);
        if (tas->treble == ucontrol->value.integer.value[0]) {
                mutex_unlock(&tas->mtx);
@@ -610,6 +626,9 @@ static int tas_snd_bass_put(struct snd_kcontrol *kcontrol,
 {
        struct tas *tas = snd_kcontrol_chip(kcontrol);
 
+       if (ucontrol->value.integer.value[0] < TAS3004_BASS_MIN ||
+           ucontrol->value.integer.value[0] > TAS3004_BASS_MAX)
+               return -EINVAL;
        mutex_lock(&tas->mtx);
        if (tas->bass == ucontrol->value.integer.value[0]) {
                mutex_unlock(&tas->mtx);
diff --git a/sound/aoa/fabrics/snd-aoa-fabric-layout.c 
b/sound/aoa/fabrics/snd-aoa-fabric-layout.c
index 8b2ba99..dea7abb 100644
--- a/sound/aoa/fabrics/snd-aoa-fabric-layout.c
+++ b/sound/aoa/fabrics/snd-aoa-fabric-layout.c
@@ -600,7 +600,7 @@ static int n##_control_put(struct snd_kcontrol *kcontrol,   
        \
        struct gpio_runtime *gpio = snd_kcontrol_chip(kcontrol);        \
        if (gpio->methods && gpio->methods->get_##n)                    \
                gpio->methods->set_##n(gpio,                            \
-                       ucontrol->value.integer.value[0]);              \
+                       !!ucontrol->value.integer.value[0]);            \
        return 1;                                                       \
 }                                                                      \
 static struct snd_kcontrol_new n##_ctl = {                             \
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to