lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 009/477] remoteproc: Fix IDR initialisation in rproc_alloc()
    Date
    From: Alex Elder <elder@linaro.org>

    [ Upstream commit 6442df49400b466431979e7634849a464a5f1861 ]

    If ida_simple_get() returns an error when called in rproc_alloc(),
    put_device() is called to clean things up. By this time the rproc
    device type has been assigned, with rproc_type_release() as the
    release function.

    The first thing rproc_type_release() does is call:
    idr_destroy(&rproc->notifyids);

    But at the time the ida_simple_get() call is made, the notifyids
    field in the remoteproc structure has not been initialized.

    I'm not actually sure this case causes an observable problem, but
    it's incorrect. Fix this by initializing the notifyids field before
    calling ida_simple_get() in rproc_alloc().

    Fixes: b5ab5e24e960 ("remoteproc: maintain a generic child device for each rproc")
    Signed-off-by: Alex Elder <elder@linaro.org>
    Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
    Reviewed-by: Suman Anna <s-anna@ti.com>
    Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Link: https://lore.kernel.org/r/20200415204858.2448-2-mathieu.poirier@linaro.org
    Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/remoteproc/remoteproc_core.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
    index be15aace9b3c8..8f79cfd2e4678 100644
    --- a/drivers/remoteproc/remoteproc_core.c
    +++ b/drivers/remoteproc/remoteproc_core.c
    @@ -2053,6 +2053,7 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,
    rproc->dev.type = &rproc_type;
    rproc->dev.class = &rproc_class;
    rproc->dev.driver_data = rproc;
    + idr_init(&rproc->notifyids);

    /* Assign a unique device index and name */
    rproc->index = ida_simple_get(&rproc_dev_index, 0, 0, GFP_KERNEL);
    @@ -2078,8 +2079,6 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,

    mutex_init(&rproc->lock);

    - idr_init(&rproc->notifyids);
    -
    INIT_LIST_HEAD(&rproc->carveouts);
    INIT_LIST_HEAD(&rproc->mappings);
    INIT_LIST_HEAD(&rproc->traces);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 22:02    [W:3.401 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site