lkml.org 
[lkml]   [2018]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 023/205] media: pci: cx23885: handle adding to list failure
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Nicholas Mc Guire <hofrat@osadl.org>

    [ Upstream commit c5d59528e24ad22500347b199d52b9368e686a42 ]

    altera_hw_filt_init() which calls append_internal() assumes
    that the node was successfully linked in while in fact it can
    silently fail. So the call-site needs to set return to -ENOMEM
    on append_internal() returning NULL and exit through the err path.

    Fixes: 349bcf02e361 ("[media] Altera FPGA based CI driver module")

    Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
    Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/media/pci/cx23885/altera-ci.c | 10 ++++++++++
    1 file changed, 10 insertions(+)

    --- a/drivers/media/pci/cx23885/altera-ci.c
    +++ b/drivers/media/pci/cx23885/altera-ci.c
    @@ -665,6 +665,10 @@ static int altera_hw_filt_init(struct al
    }

    temp_int = append_internal(inter);
    + if (!temp_int) {
    + ret = -ENOMEM;
    + goto err;
    + }
    inter->filts_used = 1;
    inter->dev = config->dev;
    inter->fpga_rw = config->fpga_rw;
    @@ -699,6 +703,7 @@ err:
    __func__, ret);

    kfree(pid_filt);
    + kfree(inter);

    return ret;
    }
    @@ -733,6 +738,10 @@ int altera_ci_init(struct altera_ci_conf
    }

    temp_int = append_internal(inter);
    + if (!temp_int) {
    + ret = -ENOMEM;
    + goto err;
    + }
    inter->cis_used = 1;
    inter->dev = config->dev;
    inter->fpga_rw = config->fpga_rw;
    @@ -801,6 +810,7 @@ err:
    ci_dbg_print("%s: Cannot initialize CI: Error %d.\n", __func__, ret);

    kfree(state);
    + kfree(inter);

    return ret;
    }

    \
     
     \ /
      Last update: 2018-11-19 19:07    [W:4.070 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site