1 files changed, 92 insertions, 0 deletions

diff --git a/recipes-kernel/linux/files/0002-ALSA-CVE-2014-4653.patch b/recipes-kernel/linux/files/0002-ALSA-CVE-2014-4653.patch
new file mode 100644
index 0000000..8612d74
--- /dev/null
+++ b/recipes-kernel/linux/files/0002-ALSA-CVE-2014-4653.patch
@@ -0,0 +1,92 @@
+From 0bf595fd311aa4d6e82c43879f2c0d0650e83271 Mon Sep 17 00:00:00 2001
+From: Lars-Peter Clausen <lars@metafoo.de>
+Date: Wed, 18 Jun 2014 13:32:33 +0200
+Subject: [PATCH] ALSA: control: Don't access controls outside of protected
+ regions
+
+commit fd9f26e4eca5d08a27d12c0933fceef76ed9663d upstream.
+
+A control that is visible on the card->controls list can be freed at any time.
+This means we must not access any of its memory while not holding the
+controls_rw_lock. Otherwise we risk a use after free access.
+
+This fixes CVE-2014-4653
+Upstream-Status: Backport
+
+Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
+Acked-by: Jaroslav Kysela <perex@perex.cz>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
+---
+ sound/core/control.c | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/sound/core/control.c b/sound/core/control.c
+index 15bc844..d4a597f 100644
+--- a/sound/core/control.c
++++ b/sound/core/control.c
+@@ -331,6 +331,7 @@ int snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol)
+ {
+        struct snd_ctl_elem_id id;
+        unsigned int idx;
++       unsigned int count;
+        int err = -EINVAL;
+ 
+        if (! kcontrol)
+@@ -359,8 +360,9 @@ int snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol)
+        card->controls_count += kcontrol->count;
+        kcontrol->id.numid = card->last_numid + 1;
+        card->last_numid += kcontrol->count;
++       count = kcontrol->count;
+        up_write(&card->controls_rwsem);
+-       for (idx = 0; idx < kcontrol->count; idx++, id.index++, id.numid++)
++       for (idx = 0; idx < count; idx++, id.index++, id.numid++)
+                snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_ADD, &id);
+        return 0;
+ 
+@@ -389,6 +391,7 @@ int snd_ctl_replace(struct snd_card *card, struct snd_kcontrol *kcontrol,
+                    bool add_on_replace)
+ {
+        struct snd_ctl_elem_id id;
++       unsigned int count;
+        unsigned int idx;
+        struct snd_kcontrol *old;
+        int ret;
+@@ -424,8 +427,9 @@ add:
+        card->controls_count += kcontrol->count;
+        kcontrol->id.numid = card->last_numid + 1;
+        card->last_numid += kcontrol->count;
++       count = kcontrol->count;
+        up_write(&card->controls_rwsem);
+-       for (idx = 0; idx < kcontrol->count; idx++, id.index++, id.numid++)
++       for (idx = 0; idx < count; idx++, id.index++, id.numid++)
+                snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_ADD, &id);
+        return 0;
+ 
+@@ -898,9 +902,9 @@ static int snd_ctl_elem_write(struct snd_card *card, struct snd_ctl_file *file,
+                        result = kctl->put(kctl, control);
+                }
+                if (result > 0) {
++                       struct snd_ctl_elem_id id = control->id;
+                        up_read(&card->controls_rwsem);
+-                       snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE,
+-                                      &control->id);
++                       snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, &id);
+                        return 0;
+                }
+        }
+@@ -1334,8 +1338,9 @@ static int snd_ctl_tlv_ioctl(struct snd_ctl_file *file,
+                }
+                err = kctl->tlv.c(kctl, op_flag, tlv.length, _tlv->tlv);
+                if (err > 0) {
++                       struct snd_ctl_elem_id id = kctl->id;
+                        up_read(&card->controls_rwsem);
+-                       snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_TLV, &kctl->id);
++                       snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_TLV, &id);
+                        return 0;
+                }
+        } else {
+-- 
+1.9.1
+