From: David Marchand <david.marchand@redhat.com>
To: wangyunjian <wangyunjian@huawei.com>
Cc: dev <dev@dpdk.org>, "Lilijun (Jerry)" <jerry.lilijun@huawei.com>,
xudingke <xudingke@huawei.com>, dpdk stable <stable@dpdk.org>
Subject: Re: [dpdk-dev] [PATCH] eal: fix memory leak in uevent parse and process
Date: Tue, 20 Oct 2020 16:07:00 +0200 [thread overview]
Message-ID: <CAJFAV8yxzdVNWEp3e8+d4nAU2V3O=zzAghRSxpPtSnDYYte2-Q@mail.gmail.com> (raw)
In-Reply-To: <1590231141-30684-1-git-send-email-wangyunjian@huawei.com>
On Sat, May 23, 2020 at 12:52 PM wangyunjian <wangyunjian@huawei.com> wrote:
>
> From: Yunjian Wang <wangyunjian@huawei.com>
>
> When the memory for uevent.devname is allocated in dev_uev_parse(). It
> is not freed when parse the subsystem layer fails in dev_uev_parse().
> And Before return, it is also not freed in dev_uev_handler(). These
> cause a memory leak.
>
> Fixes: 0d0f478d0483 ("eal/linux: add uevent parse and process")
> Cc: stable@dpdk.org
>
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> ---
> lib/librte_eal/linux/eal_dev.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/lib/librte_eal/linux/eal_dev.c b/lib/librte_eal/linux/eal_dev.c
> index 83c9cd660..3a2bf8514 100644
> --- a/lib/librte_eal/linux/eal_dev.c
> +++ b/lib/librte_eal/linux/eal_dev.c
> @@ -189,7 +189,7 @@ dev_uev_parse(const char *buf, struct rte_dev_event *event, int length)
> else if (!strncmp(subsystem, "vfio", 4))
> event->subsystem = EAL_DEV_EVENT_SUBSYSTEM_VFIO;
> else
> - return -1;
> + goto out;
Changed label as err.
>
> /* parse the action type */
> if (!strncmp(action, "add", 3))
> @@ -197,8 +197,12 @@ dev_uev_parse(const char *buf, struct rte_dev_event *event, int length)
> else if (!strncmp(action, "remove", 6))
> event->type = RTE_DEV_EVENT_REMOVE;
> else
> - return -1;
> + goto out;
> return 0;
> +out:
> + if (event->devname)
No need for this check.
Removed while applying.
> + free(event->devname);
> + return -1;
> }
>
> static void
> @@ -277,12 +281,14 @@ dev_uev_handler(__rte_unused void *param)
> rte_spinlock_unlock(&failure_handle_lock);
> }
> rte_dev_event_callback_process(uevent.devname, uevent.type);
> + free(uevent.devname);
> }
>
> return;
>
> failure_handle_err:
> rte_spinlock_unlock(&failure_handle_lock);
> + free(uevent.devname);
> }
>
> int
> --
> 2.23.0
Reviewed-by: David Marchand <david.marchand@redhat.com>
Applied, thanks.
--
David Marchand
prev parent reply other threads:[~2020-10-20 14:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-23 10:52 wangyunjian
2020-07-17 11:44 ` wangyunjian
2020-10-20 14:07 ` David Marchand [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='CAJFAV8yxzdVNWEp3e8+d4nAU2V3O=zzAghRSxpPtSnDYYte2-Q@mail.gmail.com' \
--to=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=jerry.lilijun@huawei.com \
--cc=stable@dpdk.org \
--cc=wangyunjian@huawei.com \
--cc=xudingke@huawei.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;
as well as URLs for NNTP newsgroup(s).