lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 419/862] soc: qcom: smsm: Fix refcount leak bugs in qcom_smsm_probe()
    Date
    From: Liang He <windhl@126.com>

    [ Upstream commit af8f6f39b8afd772fda4f8e61823ef8c021bf382 ]

    There are two refcount leak bugs in qcom_smsm_probe():

    (1) The 'local_node' is escaped out from for_each_child_of_node() as
    the break of iteration, we should call of_node_put() for it in error
    path or when it is not used anymore.
    (2) The 'node' is escaped out from for_each_available_child_of_node()
    as the 'goto', we should call of_node_put() for it in goto target.

    Fixes: c97c4090ff72 ("soc: qcom: smsm: Add driver for Qualcomm SMSM")
    Signed-off-by: Liang He <windhl@126.com>
    Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Link: https://lore.kernel.org/r/20220721135217.1301039-1-windhl@126.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/soc/qcom/smsm.c | 20 +++++++++++++-------
    1 file changed, 13 insertions(+), 7 deletions(-)

    diff --git a/drivers/soc/qcom/smsm.c b/drivers/soc/qcom/smsm.c
    index 9df9bba242f3..3e8994d6110e 100644
    --- a/drivers/soc/qcom/smsm.c
    +++ b/drivers/soc/qcom/smsm.c
    @@ -526,7 +526,7 @@ static int qcom_smsm_probe(struct platform_device *pdev)
    for (id = 0; id < smsm->num_hosts; id++) {
    ret = smsm_parse_ipc(smsm, id);
    if (ret < 0)
    - return ret;
    + goto out_put;
    }

    /* Acquire the main SMSM state vector */
    @@ -534,13 +534,14 @@ static int qcom_smsm_probe(struct platform_device *pdev)
    smsm->num_entries * sizeof(u32));
    if (ret < 0 && ret != -EEXIST) {
    dev_err(&pdev->dev, "unable to allocate shared state entry\n");
    - return ret;
    + goto out_put;
    }

    states = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_SMSM_SHARED_STATE, NULL);
    if (IS_ERR(states)) {
    dev_err(&pdev->dev, "Unable to acquire shared state entry\n");
    - return PTR_ERR(states);
    + ret = PTR_ERR(states);
    + goto out_put;
    }

    /* Acquire the list of interrupt mask vectors */
    @@ -548,13 +549,14 @@ static int qcom_smsm_probe(struct platform_device *pdev)
    ret = qcom_smem_alloc(QCOM_SMEM_HOST_ANY, SMEM_SMSM_CPU_INTR_MASK, size);
    if (ret < 0 && ret != -EEXIST) {
    dev_err(&pdev->dev, "unable to allocate smsm interrupt mask\n");
    - return ret;
    + goto out_put;
    }

    intr_mask = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_SMSM_CPU_INTR_MASK, NULL);
    if (IS_ERR(intr_mask)) {
    dev_err(&pdev->dev, "unable to acquire shared memory interrupt mask\n");
    - return PTR_ERR(intr_mask);
    + ret = PTR_ERR(intr_mask);
    + goto out_put;
    }

    /* Setup the reference to the local state bits */
    @@ -565,7 +567,8 @@ static int qcom_smsm_probe(struct platform_device *pdev)
    smsm->state = qcom_smem_state_register(local_node, &smsm_state_ops, smsm);
    if (IS_ERR(smsm->state)) {
    dev_err(smsm->dev, "failed to register qcom_smem_state\n");
    - return PTR_ERR(smsm->state);
    + ret = PTR_ERR(smsm->state);
    + goto out_put;
    }

    /* Register handlers for remote processor entries of interest. */
    @@ -595,16 +598,19 @@ static int qcom_smsm_probe(struct platform_device *pdev)
    }

    platform_set_drvdata(pdev, smsm);
    + of_node_put(local_node);

    return 0;

    unwind_interfaces:
    + of_node_put(node);
    for (id = 0; id < smsm->num_entries; id++)
    if (smsm->entries[id].domain)
    irq_domain_remove(smsm->entries[id].domain);

    qcom_smem_state_unregister(smsm->state);
    -
    +out_put:
    + of_node_put(local_node);
    return ret;
    }

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 11:14    [W:3.195 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site