lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 18/56] ASoC: rt5640: Fix NULL dereference on module unload
    Date
    From: Dmitry Osipenko <digetx@gmail.com>

    [ Upstream commit 89b71b3f02d8ae5a08a1dd6f4a2098b7b868d498 ]

    The rt5640->jack is NULL if jack is already disabled at the time of
    driver's module unloading.

    Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
    Link: https://lore.kernel.org/r/20200106014707.11378-1-digetx@gmail.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/rt5640.c | 7 +++++++
    1 file changed, 7 insertions(+)

    diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
    index 27770143ae8f2..974e1a4491723 100644
    --- a/sound/soc/codecs/rt5640.c
    +++ b/sound/soc/codecs/rt5640.c
    @@ -2435,6 +2435,13 @@ static void rt5640_disable_jack_detect(struct snd_soc_component *component)
    {
    struct rt5640_priv *rt5640 = snd_soc_component_get_drvdata(component);

    + /*
    + * soc_remove_component() force-disables jack and thus rt5640->jack
    + * could be NULL at the time of driver's module unloading.
    + */
    + if (!rt5640->jack)
    + return;
    +
    disable_irq(rt5640->irq);
    rt5640_cancel_work(rt5640);

    --
    2.20.1
    \
     
     \ /
      Last update: 2020-01-24 15:30    [W:4.149 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site