From: Mark Brown Date: Mon, 14 Jan 2019 23:29:36 +0000 (+0000) Subject: ASoC: core: Make snd_soc_find_component() more robust X-Git-Tag: v5.4-rc1~1594^2^2~19 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5a7b2aabc1aa0393f067d9325ada96fdf67f8cb7;p=platform%2Fkernel%2Flinux-rpi.git ASoC: core: Make snd_soc_find_component() more robust There are some use cases where you're checking for a lot of things on a card and it makes sense that you might end up trying to call snd_soc_find_component() without either a name or an of_node. Currently in that case we try to dereference the name and crash but it's more useful to allow the caller to just treat that as a case where we don't find anything, that error handling will already exist. Inspired by a patch from Ajit Pandey fixing some callers. Fixes: 8780cf1142a5 ("ASoC: soc-core: defer card probe until all component is added to list") Reported-by: Pierre-Louis Bossart Signed-off-by: Mark Brown --- diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index cdcc417..b680c67 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -742,7 +742,7 @@ static struct snd_soc_component *soc_find_component( if (of_node) { if (component->dev->of_node == of_node) return component; - } else if (strcmp(component->name, name) == 0) { + } else if (name && strcmp(component->name, name) == 0) { return component; } }