lkml.org 
[lkml]   [2020]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 09/27] ASoC: codecs: hdac_hdmi: Fix incorrect use of list_for_each_entry
    Date
    From: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>

    [ Upstream commit 326b509238171d37402dbe308e154cc234ed1960 ]

    If we don't find any pcm, pcm will point at address at an offset from
    the the list head and not a meaningful structure. Fix this by returning
    correct pcm if found and NULL if not. Found with coccinelle.

    Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
    Link: https://lore.kernel.org/r/20200415162849.308-1-amadeuszx.slawinski@linux.intel.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/hdac_hdmi.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c
    index 1c3626347e12b..aeeec1144558e 100644
    --- a/sound/soc/codecs/hdac_hdmi.c
    +++ b/sound/soc/codecs/hdac_hdmi.c
    @@ -142,14 +142,14 @@ static struct hdac_hdmi_pcm *
    hdac_hdmi_get_pcm_from_cvt(struct hdac_hdmi_priv *hdmi,
    struct hdac_hdmi_cvt *cvt)
    {
    - struct hdac_hdmi_pcm *pcm = NULL;
    + struct hdac_hdmi_pcm *pcm;

    list_for_each_entry(pcm, &hdmi->pcm_list, head) {
    if (pcm->cvt == cvt)
    - break;
    + return pcm;
    }

    - return pcm;
    + return NULL;
    }

    static void hdac_hdmi_jack_report(struct hdac_hdmi_pcm *pcm,
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-04-30 16:03    [W:5.089 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site