]> git.baikalelectronics.ru Git - kernel.git/commit
ASoC: dapm: Fix NULL pointer dereference when registering card with widgets
authorJarkko Nikula <jarkko.nikula@linux.intel.com>
Fri, 3 Oct 2014 12:32:40 +0000 (15:32 +0300)
committerMark Brown <broonie@kernel.org>
Fri, 3 Oct 2014 14:39:19 +0000 (15:39 +0100)
commit86039e775fd4f0ff970a14d96fd899ea2ffe18ea
tree7de459e18dda0ac4f4a032222d246bd245f0f939
parent42af85dc9248d35aba179acafaf84ab73d140707
ASoC: dapm: Fix NULL pointer dereference when registering card with widgets

Commit 42af85dc9248 ("ASoC: Remove CODEC pointer from snd_soc_dapm_context")
introduced regression to snd_soc_dapm_new_controls() when registering a card
with card->dapm_widgets set. Call chain is:

    snd_soc_register_card()
    -> snd_soc_instantiate_card()
       -> snd_soc_dapm_new_controls()
          -> snd_soc_dapm_new_control()

Null pointer dereference occurs since card->dapm context doesn't have
associated component. Fix this by setting widget codec pointer
conditionally.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-dapm.c