[dpdk-stable] patch 'eal/linux: fix memory leak in uevent handling' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/20. 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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 5594a7c182d5d66b1c3ad94dbc3a25cbcc540270 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian at huawei.com>
Date: Sat, 23 May 2020 18:52:21 +0800
Subject: [PATCH] eal/linux: fix memory leak in uevent handling

[ upstream commit 01072d52affac0f7fb6b8a5c8dd98015c4cef4c3 ]

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().
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")

Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
Reviewed-by: David Marchand <david.marchand at redhat.com>
---
 lib/librte_eal/linux/eal/eal_dev.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/linux/eal/eal_dev.c b/lib/librte_eal/linux/eal/eal_dev.c
index 83b6068264..803979ff46 100644
--- a/lib/librte_eal/linux/eal/eal_dev.c
+++ b/lib/librte_eal/linux/eal/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 err;
 
 	/* parse the action type */
 	if (!strncmp(action, "add", 3))
@@ -197,8 +197,11 @@ 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 err;
 	return 0;
+err:
+	free(event->devname);
+	return -1;
 }
 
 static void
@@ -276,12 +279,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.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:18.034048101 +0000
+++ 0205-eal-linux-fix-memory-leak-in-uevent-handling.patch	2020-10-28 10:35:11.812834558 +0000
@@ -1,27 +1,28 @@
-From 01072d52affac0f7fb6b8a5c8dd98015c4cef4c3 Mon Sep 17 00:00:00 2001
+From 5594a7c182d5d66b1c3ad94dbc3a25cbcc540270 Mon Sep 17 00:00:00 2001
 From: Yunjian Wang <wangyunjian at huawei.com>
 Date: Sat, 23 May 2020 18:52:21 +0800
 Subject: [PATCH] eal/linux: fix memory leak in uevent handling
 
+[ upstream commit 01072d52affac0f7fb6b8a5c8dd98015c4cef4c3 ]
+
 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().
 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 at dpdk.org
 
 Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
 Reviewed-by: David Marchand <david.marchand at redhat.com>
 ---
- lib/librte_eal/linux/eal_dev.c | 9 +++++++--
+ lib/librte_eal/linux/eal/eal_dev.c | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
-diff --git a/lib/librte_eal/linux/eal_dev.c b/lib/librte_eal/linux/eal_dev.c
-index 2e15762b56..5c0e752b2d 100644
---- a/lib/librte_eal/linux/eal_dev.c
-+++ b/lib/librte_eal/linux/eal_dev.c
-@@ -195,7 +195,7 @@ dev_uev_parse(const char *buf, struct rte_dev_event *event, int length)
+diff --git a/lib/librte_eal/linux/eal/eal_dev.c b/lib/librte_eal/linux/eal/eal_dev.c
+index 83b6068264..803979ff46 100644
+--- a/lib/librte_eal/linux/eal/eal_dev.c
++++ b/lib/librte_eal/linux/eal/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
@@ -30,7 +31,7 @@
  
  	/* parse the action type */
  	if (!strncmp(action, "add", 3))
-@@ -203,8 +203,11 @@ dev_uev_parse(const char *buf, struct rte_dev_event *event, int length)
+@@ -197,8 +197,11 @@ 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
@@ -43,7 +44,7 @@
  }
  
  static void
-@@ -282,12 +285,14 @@ dev_uev_handler(__rte_unused void *param)
+@@ -276,12 +279,14 @@ dev_uev_handler(__rte_unused void *param)
  			rte_spinlock_unlock(&failure_handle_lock);
  		}
  		rte_dev_event_callback_process(uevent.devname, uevent.type);