lkml.org 
[lkml]   [2018]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.4 40/43] ASoC: dapm: Fix potential DAI widget pointer deref when linking DAIs
    Date
    From: Liam Girdwood <liam.r.girdwood@linux.intel.com>

    [ Upstream commit e01b4f624278d5efe5fb5da585ca371947b16680 ]

    Sometime a component or topology may configure a DAI widget with no
    private data leading to a dev_dbg() dereferencne of this data.

    Fix this to check for non NULL private data and let users know if widget
    is missing DAI.

    Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    sound/soc/soc-dapm.c | 7 +++++++
    1 file changed, 7 insertions(+)

    diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
    index 9e784cc3e5d2..0aefed8ab0cf 100644
    --- a/sound/soc/soc-dapm.c
    +++ b/sound/soc/soc-dapm.c
    @@ -3864,6 +3864,13 @@ int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card)
    continue;
    }

    + /* let users know there is no DAI to link */
    + if (!dai_w->priv) {
    + dev_dbg(card->dev, "dai widget %s has no DAI\n",
    + dai_w->name);
    + continue;
    + }
    +
    dai = dai_w->priv;

    /* ...find all widgets with the same stream and link them */
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-09-17 05:11    [W:2.115 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site