AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-25 04:50:57 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: rockchip: Allocate enough memory so we don't overflow routes

Browse Source 
In the recent commit d9f9c167ed ("ASoC: rockchip: Init dapm routes
dynamically") we improperly allocated memory for the card->dapm_routes
causing us to overflow the allocation on every boot.  Oops.

Let's allocate the correct amount of memory.  We'll also add a check
to make sure that we don't overrun memory even if we encounter some
sort of weird device tree.

Fixes: d9f9c167ed ("ASoC: rockchip: Init dapm routes dynamically")
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Douglas Anderson 2017-09-29 15:03:24 -07:00 committed by Mark Brown
parent 7e0dc9aeae
commit 8eae6c2585
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/rockchip/rk3399_gru_sound.c
View File

@ -494,13 +494,17 @@ static int rockchip_sound_of_parse_dais(struct device *dev,
struct snd_soc_dai_link *dai;
struct snd_soc_dapm_route *routes;
int i, index;
int num_routes;
card->dai_link = devm_kzalloc(dev, sizeof(rockchip_dais),
GFP_KERNEL);
if (!card->dai_link)
return -ENOMEM;
routes = devm_kzalloc(dev, sizeof(rockchip_routes),
num_routes = 0;
for (i = 0; i < ARRAY_SIZE(rockchip_routes); i++)
num_routes += rockchip_routes[i].num_routes;
routes = devm_kzalloc(dev, num_routes * sizeof(*routes),
GFP_KERNEL);
if (!routes)
return -ENOMEM;
@ -538,6 +542,12 @@ static int rockchip_sound_of_parse_dais(struct device *dev,
dai->platform_of_node = np_cpu;
dai->cpu_of_node = np_cpu;
if (card->num_dapm_routes + rockchip_routes[index].num_routes >
num_routes) {
dev_err(dev, "Too many routes\n");
return -EINVAL;
}
memcpy(routes + card->num_dapm_routes,
rockchip_routes[index].routes,
rockchip_routes[index].num_routes * sizeof(*routes));