diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-06-18 13:32:34 +0200 |
|---|---|---|
| committer | Stefan Bader <stefan.bader@canonical.com> | 2014-11-25 15:20:24 +0100 |
| commit | 34bdac8fa0a8ec01480dc32c976c347a25ef16a7 (patch) | |
| tree | 72428ccd16fd1649968ba5ca48de20e3a9d43c03 | |
| parent | 6f3a1969e01df2b9137b4032917da17a77bd777e (diff) | |
| download | linux-2.6.32.y-drm33.z-34bdac8fa0a8ec01480dc32c976c347a25ef16a7.tar.gz | |
ALSA: control: Handle numid overflow
Each control gets automatically assigned its numids when the control is created.
The allocation is done by incrementing the numid by the amount of allocated
numids per allocation. This means that excessive creation and destruction of
controls (e.g. via SNDRV_CTL_IOCTL_ELEM_ADD/REMOVE) can cause the id to
eventually overflow. Currently when this happens for the control that caused the
overflow kctl->id.numid + kctl->count will also over flow causing it to be
smaller than kctl->id.numid. Most of the code assumes that this is something
that can not happen, so we need to make sure that it won't happen
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Jaroslav Kysela <perex@perex.cz>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(cherry picked from commit ac902c112d90a89e59916f751c2745f4dbdbb4bd)
[wt: part 2 of CVE-2014-4656]
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
| -rw-r--r-- | sound/core/control.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/core/control.c b/sound/core/control.c index 80bb3ed7c54856..d7f4644b860238 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -278,6 +278,10 @@ static unsigned int snd_ctl_hole_check(struct snd_card *card, { struct snd_kcontrol *kctl; + /* Make sure that the ids assigned to the control do not wrap around */ + if (card->last_numid >= UINT_MAX - count) + card->last_numid = 0; + list_for_each_entry(kctl, &card->controls, list) { if ((kctl->id.numid <= card->last_numid && kctl->id.numid + kctl->count > card->last_numid) || |