lkml.org 
[lkml]   [2020]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.9 007/111] media: firewire: fix memory leak
    Date
    From: Pavel Machek <pavel@ucw.cz>

    [ Upstream commit b28e32798c78a346788d412f1958f36bb760ec03 ]

    Fix memory leak in node_probe.

    Signed-off-by: Pavel Machek (CIP) <pavel@denx.de>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/firewire/firedtv-fw.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/firewire/firedtv-fw.c b/drivers/media/firewire/firedtv-fw.c
    index 3f1ca40b9b987..8a8585261bb80 100644
    --- a/drivers/media/firewire/firedtv-fw.c
    +++ b/drivers/media/firewire/firedtv-fw.c
    @@ -272,8 +272,10 @@ static int node_probe(struct fw_unit *unit, const struct ieee1394_device_id *id)

    name_len = fw_csr_string(unit->directory, CSR_MODEL,
    name, sizeof(name));
    - if (name_len < 0)
    - return name_len;
    + if (name_len < 0) {
    + err = name_len;
    + goto fail_free;
    + }
    for (i = ARRAY_SIZE(model_names); --i; )
    if (strlen(model_names[i]) <= name_len &&
    strncmp(name, model_names[i], name_len) == 0)
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-10-18 22:01    [W:4.345 / U:2.800 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site