OSDN Git Service

topology: decode: Fix infinite loop in decoding enum control
authorPiotr Maziarz <piotrx.maziarz@linux.intel.com>
Mon, 31 Aug 2020 09:08:55 +0000 (11:08 +0200)
committerJaroslav Kysela <perex@perex.cz>
Mon, 31 Aug 2020 11:03:01 +0000 (13:03 +0200)
Accessing memory outside of allocated boundaries caused segmentation fault.

Signed-off-by: Piotr Maziarz <piotrx.maziarz@linux.intel.com>
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
src/topology/ctl.c

index 6e6c1d1..0aa49ab 100644 (file)
@@ -1367,7 +1367,7 @@ int tplg_decode_control_enum1(snd_tplg_t *tplg,
                et->texts = tplg_calloc(heap, sizeof(char *) * ec->items);
                if (!et->texts)
                        return -ENOMEM;
-               for (i = 0; ec->items; i++) {
+               for (i = 0; i < ec->items; i++) {
                        unsigned int j = i * sizeof(int) * ENUM_VAL_SIZE;
                        et->texts[i] = ec->texts[i];
                        et->values[i] = (int *)&ec->values[j];