Skip to content

topology: harden binary topology decoder against malformed input #526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HarshRajSinghania wants to merge 1 commit into
base: master
Choose a base branch
from
Open

topology: harden binary topology decoder against malformed input #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 30 additions & 6 deletions src/topology/dapm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,6 +960,11 @@ int tplg_decode_dapm_widget(snd_tplg_t *tplg,

for (index = 0; index < w->num_kcontrols; index++) {
chdr = bin;
if (size < sizeof(*chdr)) {
snd_error(TOPOLOGY, "dapm widget: truncated kcontrol header");
err = -EINVAL;
goto retval;
}
switch (chdr->type) {
case SND_SOC_TPLG_TYPE_MIXER:
mt = tplg_calloc(&heap, sizeof(*mt));
Expand All @@ -970,7 +975,12 @@ int tplg_decode_dapm_widget(snd_tplg_t *tplg,
wt->ctl[index] = (void *)mt;
wt->num_ctls++;
mc = bin;
size2 = mc->size + mc->priv.size;
if (size < sizeof(*mc)) {
snd_error(TOPOLOGY, "dapm widget: truncated mixer");
err = -EINVAL;
goto retval;
}
size2 = (size_t)mc->size + (size_t)mc->priv.size;
tplg_log(tplg, 'D', pos, "kcontrol mixer size %zd", size2);
if (size2 > size) {
snd_error(TOPOLOGY, "dapm widget: small mixer size %d",
Expand All @@ -991,7 +1001,12 @@ int tplg_decode_dapm_widget(snd_tplg_t *tplg,
wt->ctl[index] = (void *)et;
wt->num_ctls++;
ec = bin;
size2 = ec->size + ec->priv.size;
if (size < sizeof(*ec)) {
snd_error(TOPOLOGY, "dapm widget: truncated enum");
err = -EINVAL;
goto retval;
}
size2 = (size_t)ec->size + (size_t)ec->priv.size;
tplg_log(tplg, 'D', pos, "kcontrol enum size %zd", size2);
if (size2 > size) {
snd_error(TOPOLOGY, "dapm widget: small enum size %d",
Expand All @@ -1011,7 +1026,12 @@ int tplg_decode_dapm_widget(snd_tplg_t *tplg,
wt->ctl[index] = (void *)bt;
wt->num_ctls++;
bc = bin;
size2 = bc->size + bc->priv.size;
if (size < sizeof(*bc)) {
snd_error(TOPOLOGY, "dapm widget: truncated bytes");
err = -EINVAL;
goto retval;
}
size2 = (size_t)bc->size + (size_t)bc->priv.size;
tplg_log(tplg, 'D', pos, "kcontrol bytes size %zd", size2);
if (size2 > size) {
snd_error(TOPOLOGY, "dapm widget: small bytes size %d",
Expand Down Expand Up @@ -1069,12 +1089,14 @@ int tplg_decode_dapm_graph(snd_tplg_t *tplg,
return err;

asize = sizeof(*gt) + (size / sizeof(*g)) * sizeof(*ge);
gt = alloca(asize);
memset(gt, 0, asize);
gt = calloc(1, asize);
if (gt == NULL)
return -ENOMEM;
for (ge = gt->elem; size > 0; ge++) {
g = bin;
if (size < sizeof(*g)) {
snd_error(TOPOLOGY, "dapm graph: small size %d", size);
free(gt);
return -EINVAL;
}
ge->src = g->source;
Expand All @@ -1089,5 +1111,7 @@ int tplg_decode_dapm_graph(snd_tplg_t *tplg,
}

t.graph = gt;
return snd_tplg_add_object(tplg, &t);
err = snd_tplg_add_object(tplg, &t);
free(gt);
return err;
}
4 changes: 2 additions & 2 deletions src/topology/decoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ int snd_tplg_decode(snd_tplg_t *tplg, void *bin, size_t size, int dflags)
return -EINVAL;
}

if (size - pos < hdr->size + hdr->payload_size) {
if ((uint64_t)hdr->size + (uint64_t)hdr->payload_size > (uint64_t)(size - pos)) {
snd_error(TOPOLOGY, "incomplete payload data to decode");
return -EINVAL;
}
Expand Down Expand Up @@ -116,6 +116,6 @@ int snd_tplg_decode(snd_tplg_t *tplg, void *bin, size_t size, int dflags)
err = tptr->decod(tplg, pos, hdr, b + hdr->size, hdr->payload_size);
if (err < 0)
return err;
b += hdr->size + hdr->payload_size;
b += (size_t)hdr->size + (size_t)hdr->payload_size;
}
}
Loading