lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 210/717] media: siano: fix memory leak of debugfs members in smsdvb_hotplug
    Date
    From: Keita Suzuki <keitasuzuki.park@sslab.ics.keio.ac.jp>

    [ Upstream commit abf287eeff4c6da6aa804bbd429dfd9d0dfb6ea7 ]

    When dvb_create_media_graph fails, the debugfs kept inside client should
    be released. However, the current implementation does not release them.

    Fix this by adding a new goto label to call smsdvb_debugfs_release.

    Fixes: 0d3ab8410dcb ("[media] dvb core: must check dvb_create_media_graph()")
    Signed-off-by: Keita Suzuki <keitasuzuki.park@sslab.ics.keio.ac.jp>
    Signed-off-by: Sean Young <sean@mess.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/common/siano/smsdvb-main.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/media/common/siano/smsdvb-main.c b/drivers/media/common/siano/smsdvb-main.c
    index 88f90dfd368b1..ae17407e477a4 100644
    --- a/drivers/media/common/siano/smsdvb-main.c
    +++ b/drivers/media/common/siano/smsdvb-main.c
    @@ -1169,12 +1169,15 @@ static int smsdvb_hotplug(struct smscore_device_t *coredev,
    rc = dvb_create_media_graph(&client->adapter, true);
    if (rc < 0) {
    pr_err("dvb_create_media_graph failed %d\n", rc);
    - goto client_error;
    + goto media_graph_error;
    }

    pr_info("DVB interface registered.\n");
    return 0;

    +media_graph_error:
    + smsdvb_debugfs_release(client);
    +
    client_error:
    dvb_unregister_frontend(&client->frontend);

    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:11    [W:4.091 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site