lkml.org 
[lkml]   [2019]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 022/306] ALSA: isight: fix leak of reference to firewire unit in error path of .probe callback
    Date
    From: Takashi Sakamoto <o-takashi@sakamocchi.jp>

    [ Upstream commit 51e68fb0929c29e47e9074ca3e99ffd6021a1c5a ]

    In some error paths, reference count of firewire unit is not decreased.
    This commit fixes the bug.

    Fixes: 5b14ec25a79b('ALSA: firewire: release reference count of firewire unit in .remove callback of bus driver')
    Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/firewire/isight.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
    index 30957477e005e..0717ab9e48e3b 100644
    --- a/sound/firewire/isight.c
    +++ b/sound/firewire/isight.c
    @@ -640,7 +640,7 @@ static int isight_probe(struct fw_unit *unit,
    if (!isight->audio_base) {
    dev_err(&unit->device, "audio unit base not found\n");
    err = -ENXIO;
    - goto err_unit;
    + goto error;
    }
    fw_iso_resources_init(&isight->resources, unit);

    @@ -669,12 +669,12 @@ static int isight_probe(struct fw_unit *unit,
    dev_set_drvdata(&unit->device, isight);

    return 0;
    -
    -err_unit:
    - fw_unit_put(isight->unit);
    - mutex_destroy(&isight->mutex);
    error:
    snd_card_free(card);
    +
    + mutex_destroy(&isight->mutex);
    + fw_unit_put(isight->unit);
    +
    return err;
    }

    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-27 22:31    [W:3.166 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site