lkml.org 
[lkml]   [2019]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 043/305] media: pci: cx23885: handle adding to list failure
    3.16.63-rc1 review patch.  If anyone has any objections, please let me know.

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

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

    commit c5d59528e24ad22500347b199d52b9368e686a42 upstream.

    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: Ben Hutchings <ben@decadent.org.uk>
    ---
    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
    @@ -666,6 +666,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;
    @@ -700,6 +704,7 @@ err:
    __func__, ret);

    kfree(pid_filt);
    + kfree(inter);

    return ret;
    }
    @@ -735,6 +740,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;
    @@ -803,6 +812,7 @@ err:
    ci_dbg_print("%s: Cannot initialize CI: Error %d.\n", __func__, ret);

    kfree(state);
    + kfree(inter);

    return ret;
    }
    \
     
     \ /
      Last update: 2019-02-03 15:23    [W:4.841 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site