DPDK patches and discussions
 help / color / mirror / Atom feed
* [dpdk-dev] [PATCH] eal: fix memory leak in uevent parse and process
@ 2020-05-23 10:52 wangyunjian
  2020-07-17 11:44 ` wangyunjian
  2020-10-20 14:07 ` David Marchand
  0 siblings, 2 replies; 3+ messages in thread
From: wangyunjian @ 2020-05-23 10:52 UTC (permalink / raw)
  To: dev; +Cc: jerry.lilijun, xudingke, Yunjian Wang, stable

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;
 
 	/* 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)
+		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



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-dev] [PATCH] eal: fix memory leak in uevent parse and process
  2020-05-23 10:52 [dpdk-dev] [PATCH] eal: fix memory leak in uevent parse and process wangyunjian
@ 2020-07-17 11:44 ` wangyunjian
  2020-10-20 14:07 ` David Marchand
  1 sibling, 0 replies; 3+ messages in thread
From: wangyunjian @ 2020-07-17 11:44 UTC (permalink / raw)
  To: dev, david.marchand, ferruh.yigit; +Cc: Lilijun (Jerry), xudingke, stable

Is there any ideas on this bug?
Ping for review, please.

Yunjian

> -----Original Message-----
> From: wangyunjian
> Sent: Saturday, May 23, 2020 6:52 PM
> To: dev@dpdk.org
> Cc: Lilijun (Jerry) <jerry.lilijun@huawei.com>; xudingke
> <xudingke@huawei.com>; wangyunjian <wangyunjian@huawei.com>;
> stable@dpdk.org
> Subject: [dpdk-dev] [PATCH] eal: fix memory leak in uevent parse and process
> 
> 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;
> 
>  	/* 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)
> +		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
> 


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-dev] [PATCH] eal: fix memory leak in uevent parse and process
  2020-05-23 10:52 [dpdk-dev] [PATCH] eal: fix memory leak in uevent parse and process wangyunjian
  2020-07-17 11:44 ` wangyunjian
@ 2020-10-20 14:07 ` David Marchand
  1 sibling, 0 replies; 3+ messages in thread
From: David Marchand @ 2020-10-20 14:07 UTC (permalink / raw)
  To: wangyunjian; +Cc: dev, Lilijun (Jerry), xudingke, dpdk stable

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


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-10-20 14:09 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-23 10:52 [dpdk-dev] [PATCH] eal: fix memory leak in uevent parse and process wangyunjian
2020-07-17 11:44 ` wangyunjian
2020-10-20 14:07 ` David Marchand

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ http://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git