From: Alex Dewar <alex.dewar90@gmail.com>
To: Alex Dewar <alex.dewar90@gmail.com>
Cc: Ohad Ben-Cohen <ohad@wizery.com>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Loic Pallardy <loic.pallardy@st.com>,
linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] remoteproc: core: Free rvdev on error path
Date: Thu, 3 Sep 2020 11:09:12 +0100 [thread overview]
Message-ID: <20200903100912.6op2fs6olrtlckr2@medion> (raw)
In-Reply-To: <20200903100142.57117-1-alex.dewar90@gmail.com>
On Thu, Sep 03, 2020 at 11:01:42AM +0100, Alex Dewar wrote:
> In rpoc_handle_vdev(), rvdev is not freed properly on the error path and
> one of the labels is misnamed. Fix this up.
Actually, don't apply this. I didn't realise that device_unregister
already frees memory. Sorry for the noise!
>
> Fixes: 086d08725d34 ("remoteproc: create vdev subdevice with specific dma memory pool")
> Signed-off-by: Alex Dewar <alex.dewar90@gmail.com>
> ---
> drivers/remoteproc/remoteproc_core.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
> index d4bd71f87b03..84dea43d196e 100644
> --- a/drivers/remoteproc/remoteproc_core.c
> +++ b/drivers/remoteproc/remoteproc_core.c
> @@ -531,7 +531,7 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc,
> rvdev->dev.parent = &rproc->dev;
> ret = dma_copy_dma_range_map(&rvdev->dev, rproc->dev.parent);
> if (ret)
> - return ret;
> + goto free_rvdev;
> rvdev->dev.release = rproc_rvdev_release;
> dev_set_name(&rvdev->dev, "%s#%s", dev_name(rvdev->dev.parent), name);
> dev_set_drvdata(&rvdev->dev, rvdev);
> @@ -539,7 +539,7 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc,
> ret = device_register(&rvdev->dev);
> if (ret) {
> put_device(&rvdev->dev);
> - return ret;
> + goto free_rvdev;
> }
> /* Make device dma capable by inheriting from parent's capabilities */
> set_dma_ops(&rvdev->dev, get_dma_ops(rproc->dev.parent));
> @@ -556,7 +556,7 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc,
> for (i = 0; i < rsc->num_of_vrings; i++) {
> ret = rproc_parse_vring(rvdev, rsc, i);
> if (ret)
> - goto free_rvdev;
> + goto unregister_dev;
> }
>
> /* remember the resource offset*/
> @@ -581,8 +581,10 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc,
> unwind_vring_allocations:
> for (i--; i >= 0; i--)
> rproc_free_vring(&rvdev->vring[i]);
> -free_rvdev:
> +unregister_dev:
> device_unregister(&rvdev->dev);
> +free_rvdev:
> + kfree(rvdev);
> return ret;
> }
>
> --
> 2.28.0
>
prev parent reply other threads:[~2020-09-03 10:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-03 10:01 Alex Dewar
2020-09-03 10:09 ` Alex Dewar [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200903100912.6op2fs6olrtlckr2@medion \
--to=alex.dewar90@gmail.com \
--cc=bjorn.andersson@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=loic.pallardy@st.com \
--cc=ohad@wizery.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®