UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: wm_asdp: Validate sanity of algorithm count 

If we run into I/O problems the algorithm count may be crazy, validate it
before we proceed and dump the read data for diagnostic purposes.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2012-12-19 14:00:30 +00:00
parent 45b9ee72d0
commit d62f4bc665
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sound/soc/codecs/wm_adsp.c
View File

@ -377,10 +377,10 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp)
struct wmfw_adsp2_id_hdr adsp2_id; struct wmfw_adsp2_id_hdr adsp2_id;
struct wmfw_adsp1_alg_hdr *adsp1_alg; struct wmfw_adsp1_alg_hdr *adsp1_alg;
struct wmfw_adsp2_alg_hdr *adsp2_alg; struct wmfw_adsp2_alg_hdr *adsp2_alg;
void *alg; void *alg, *buf;
const struct wm_adsp_region *mem; const struct wm_adsp_region *mem;
unsigned int pos, term; unsigned int pos, term;
size_t algs; size_t algs, buf_size;
__be32 val; __be32 val;
int i, ret; int i, ret;
@ -411,6 +411,9 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp)
return ret; return ret;
} }
buf = &adsp1_id;
buf_size = sizeof(adsp1_id);
algs = be32_to_cpu(adsp1_id.algs); algs = be32_to_cpu(adsp1_id.algs);
adsp_info(dsp, "Firmware: %x v%d.%d.%d, %zu algorithms\n", adsp_info(dsp, "Firmware: %x v%d.%d.%d, %zu algorithms\n",
be32_to_cpu(adsp1_id.fw.id), be32_to_cpu(adsp1_id.fw.id),
@ -432,6 +435,9 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp)
return ret; return ret;
} }
buf = &adsp2_id;
buf_size = sizeof(adsp2_id);
algs = be32_to_cpu(adsp2_id.algs); algs = be32_to_cpu(adsp2_id.algs);
adsp_info(dsp, "Firmware: %x v%d.%d.%d, %zu algorithms\n", adsp_info(dsp, "Firmware: %x v%d.%d.%d, %zu algorithms\n",
be32_to_cpu(adsp2_id.fw.id), be32_to_cpu(adsp2_id.fw.id),
@ -454,6 +460,13 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp)
return -EINVAL; return -EINVAL;
} }
if (algs > 1024) {
adsp_err(dsp, "Algorithm count %zx excessive\n", algs);
print_hex_dump_bytes(dev_name(dsp->dev), DUMP_PREFIX_OFFSET,
buf, buf_size);
return -EINVAL;
}
/* Read the terminator first to validate the length */ /* Read the terminator first to validate the length */
ret = regmap_raw_read(regmap, mem->base + term, &val, sizeof(val)); ret = regmap_raw_read(regmap, mem->base + term, &val, sizeof(val));
if (ret != 0) { if (ret != 0) {