diff options
| author | Li Xu <li.xu@cirrus.com> | 2019-10-01 14:09:11 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-10-01 17:43:36 +0100 |
| commit | 9daf4fd0302b2559223cf90dae7dc510c6679047 (patch) | |
| tree | d568d2ae2780fcd585d23c18c04ebb972b89d6bd /sound | |
| parent | 4bb41984bf2f4cb8ed6ec1579d317790bd941788 (diff) | |
| download | linux-9daf4fd0302b2559223cf90dae7dc510c6679047.tar.gz linux-9daf4fd0302b2559223cf90dae7dc510c6679047.tar.bz2 linux-9daf4fd0302b2559223cf90dae7dc510c6679047.zip | |
ASoC: wm_adsp: Fix theoretical NULL pointer for alg_region
Fix potential NULL pointer dereference for alg_region in
wm_adsp_buffer_parse_legacy. In practice this can never happen as
loading the firmware should have failed at the wm_adsp2_setup_algs
stage, however probably better for the code to be robust against
future changes and this is more helpful for static analysis.
Signed-off-by: Li Xu <li.xu@cirrus.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20191001130911.19238-1-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm_adsp.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index ae28d9907c30..85396d920e0a 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -3697,11 +3697,16 @@ static int wm_adsp_buffer_parse_legacy(struct wm_adsp *dsp) u32 xmalg, addr, magic; int i, ret; + alg_region = wm_adsp_find_alg_region(dsp, WMFW_ADSP2_XM, dsp->fw_id); + if (!alg_region) { + adsp_err(dsp, "No algorithm region found\n"); + return -EINVAL; + } + buf = wm_adsp_buffer_alloc(dsp); if (!buf) return -ENOMEM; - alg_region = wm_adsp_find_alg_region(dsp, WMFW_ADSP2_XM, dsp->fw_id); xmalg = dsp->ops->sys_config_size / sizeof(__be32); addr = alg_region->base + xmalg + ALG_XM_FIELD(magic); |