[dpdk-stable] patch 'devargs: fix variadic parsing memory leak' has been queued to stable release 18.08.1

Kevin Traynor ktraynor at redhat.com
Thu Nov 22 17:49:16 CET 2018


Hi,

FYI, your patch has been queued to stable release 18.08.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/28/18. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From b691e30e7003134a056d108baa2f16b2d09467a2 Mon Sep 17 00:00:00 2001
From: Gaetan Rivet <gaetan.rivet at 6wind.com>
Date: Wed, 17 Oct 2018 16:30:13 +0200
Subject: [PATCH] devargs: fix variadic parsing memory leak

[ upstream commit 97e476ad7c89303b21deea5b87fa0f0612d50f5c ]

rte_devargs_parsef will leak memory each time it is called.
The device string must be freed.

Fixes: a23bc2c4e01b ("devargs: add non-variadic parsing function")

Signed-off-by: Gaetan Rivet <gaetan.rivet at 6wind.com>
---
 lib/librte_eal/common/eal_common_devargs.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c
index dac2402a4..19c19c7d0 100644
--- a/lib/librte_eal/common/eal_common_devargs.c
+++ b/lib/librte_eal/common/eal_common_devargs.c
@@ -271,4 +271,5 @@ rte_devargs_parsef(struct rte_devargs *da, const char *format, ...)
 	size_t len;
 	char *dev;
+	int ret;
 
 	if (da == NULL)
@@ -289,5 +290,8 @@ rte_devargs_parsef(struct rte_devargs *da, const char *format, ...)
 	va_end(ap);
 
-	return rte_devargs_parse(da, dev);
+	ret = rte_devargs_parse(da, dev);
+
+	free(dev);
+	return ret;
 }
 
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-22 16:47:32.893295427 +0000
+++ 0024-devargs-fix-variadic-parsing-memory-leak.patch	2018-11-22 16:47:32.000000000 +0000
@@ -1,13 +1,14 @@
-From 97e476ad7c89303b21deea5b87fa0f0612d50f5c Mon Sep 17 00:00:00 2001
+From b691e30e7003134a056d108baa2f16b2d09467a2 Mon Sep 17 00:00:00 2001
 From: Gaetan Rivet <gaetan.rivet at 6wind.com>
 Date: Wed, 17 Oct 2018 16:30:13 +0200
 Subject: [PATCH] devargs: fix variadic parsing memory leak
 
+[ upstream commit 97e476ad7c89303b21deea5b87fa0f0612d50f5c ]
+
 rte_devargs_parsef will leak memory each time it is called.
 The device string must be freed.
 
 Fixes: a23bc2c4e01b ("devargs: add non-variadic parsing function")
-Cc: stable at dpdk.org
 
 Signed-off-by: Gaetan Rivet <gaetan.rivet at 6wind.com>
 ---
@@ -15,16 +16,16 @@
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c
-index 69e9e32e9..c1b06095e 100644
+index dac2402a4..19c19c7d0 100644
 --- a/lib/librte_eal/common/eal_common_devargs.c
 +++ b/lib/librte_eal/common/eal_common_devargs.c
-@@ -238,4 +238,5 @@ rte_devargs_parsef(struct rte_devargs *da, const char *format, ...)
+@@ -271,4 +271,5 @@ rte_devargs_parsef(struct rte_devargs *da, const char *format, ...)
  	size_t len;
  	char *dev;
 +	int ret;
  
  	if (da == NULL)
-@@ -256,5 +257,8 @@ rte_devargs_parsef(struct rte_devargs *da, const char *format, ...)
+@@ -289,5 +290,8 @@ rte_devargs_parsef(struct rte_devargs *da, const char *format, ...)
  	va_end(ap);
  
 -	return rte_devargs_parse(da, dev);


More information about the stable mailing list