* [PATCH] libmultipath/foreign: fix memory leak in nvme foreign handler
@ 2025-01-09 0:06 Benjamin Marzinski
2025-01-09 0:26 ` Benjamin Marzinski
2025-01-14 21:45 ` Martin Wilck
0 siblings, 2 replies; 3+ messages in thread
From: Benjamin Marzinski @ 2025-01-09 0:06 UTC (permalink / raw)
To: Christophe Varoqui; +Cc: device-mapper development, Martin Wilck
_find_controllers() needs to free the udev device if it doesn't get
added to a path. Otherwise it can leak memory whenever check_foreign()
is called, causing multipathd's memory usage to continually grow.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
---
libmultipath/foreign/nvme.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/libmultipath/foreign/nvme.c b/libmultipath/foreign/nvme.c
index 0b7f4eab..cde660ce 100644
--- a/libmultipath/foreign/nvme.c
+++ b/libmultipath/foreign/nvme.c
@@ -675,7 +675,8 @@ static void _find_controllers(struct context *ctx, struct nvme_map *map)
pthread_cleanup_push_cast(free_scandir_result, &sr);
for (i = 0; i < r; i++) {
char *fn = di[i]->d_name;
- struct udev_device *ctrl, *udev;
+ struct udev_device *ctrl;
+ struct udev_device *udev __attribute__((cleanup(cleanup_udev_device))) = NULL;
if (safe_snprintf(pathbuf + n, sizeof(pathbuf) - n, "/%s", fn))
continue;
@@ -719,11 +720,11 @@ static void _find_controllers(struct context *ctx, struct nvme_map *map)
continue;
path->gen.ops = &nvme_path_ops;
- path->udev = udev;
+ path->udev = steal_ptr(udev);
path->seen = true;
path->map = map;
path->ctl = udev_device_get_parent_with_subsystem_devtype
- (udev, "nvme", NULL);
+ (path->udev, "nvme", NULL);
if (path->ctl == NULL) {
condlog(1, "%s: %s: failed to get controller for %s",
__func__, THIS, fn);
@@ -744,7 +745,7 @@ static void _find_controllers(struct context *ctx, struct nvme_map *map)
}
vector_set_slot(&map->pgvec, &path->pg);
condlog(3, "%s: %s: new path %s added to %s",
- __func__, THIS, udev_device_get_sysname(udev),
+ __func__, THIS, udev_device_get_sysname(path->udev),
udev_device_get_sysname(map->udev));
}
pthread_cleanup_pop(1);
--
2.46.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] libmultipath/foreign: fix memory leak in nvme foreign handler
2025-01-09 0:06 [PATCH] libmultipath/foreign: fix memory leak in nvme foreign handler Benjamin Marzinski
@ 2025-01-09 0:26 ` Benjamin Marzinski
2025-01-14 21:45 ` Martin Wilck
1 sibling, 0 replies; 3+ messages in thread
From: Benjamin Marzinski @ 2025-01-09 0:26 UTC (permalink / raw)
To: Christophe Varoqui; +Cc: device-mapper development, Martin Wilck
On Wed, Jan 08, 2025 at 07:06:53PM -0500, Benjamin Marzinski wrote:
> _find_controllers() needs to free the udev device if it doesn't get
> added to a path. Otherwise it can leak memory whenever check_foreign()
> is called, causing multipathd's memory usage to continually grow.
>
This also belongs in the stable branch.
-Ben
> Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
> ---
> libmultipath/foreign/nvme.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/libmultipath/foreign/nvme.c b/libmultipath/foreign/nvme.c
> index 0b7f4eab..cde660ce 100644
> --- a/libmultipath/foreign/nvme.c
> +++ b/libmultipath/foreign/nvme.c
> @@ -675,7 +675,8 @@ static void _find_controllers(struct context *ctx, struct nvme_map *map)
> pthread_cleanup_push_cast(free_scandir_result, &sr);
> for (i = 0; i < r; i++) {
> char *fn = di[i]->d_name;
> - struct udev_device *ctrl, *udev;
> + struct udev_device *ctrl;
> + struct udev_device *udev __attribute__((cleanup(cleanup_udev_device))) = NULL;
>
> if (safe_snprintf(pathbuf + n, sizeof(pathbuf) - n, "/%s", fn))
> continue;
> @@ -719,11 +720,11 @@ static void _find_controllers(struct context *ctx, struct nvme_map *map)
> continue;
>
> path->gen.ops = &nvme_path_ops;
> - path->udev = udev;
> + path->udev = steal_ptr(udev);
> path->seen = true;
> path->map = map;
> path->ctl = udev_device_get_parent_with_subsystem_devtype
> - (udev, "nvme", NULL);
> + (path->udev, "nvme", NULL);
> if (path->ctl == NULL) {
> condlog(1, "%s: %s: failed to get controller for %s",
> __func__, THIS, fn);
> @@ -744,7 +745,7 @@ static void _find_controllers(struct context *ctx, struct nvme_map *map)
> }
> vector_set_slot(&map->pgvec, &path->pg);
> condlog(3, "%s: %s: new path %s added to %s",
> - __func__, THIS, udev_device_get_sysname(udev),
> + __func__, THIS, udev_device_get_sysname(path->udev),
> udev_device_get_sysname(map->udev));
> }
> pthread_cleanup_pop(1);
> --
> 2.46.2
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] libmultipath/foreign: fix memory leak in nvme foreign handler
2025-01-09 0:06 [PATCH] libmultipath/foreign: fix memory leak in nvme foreign handler Benjamin Marzinski
2025-01-09 0:26 ` Benjamin Marzinski
@ 2025-01-14 21:45 ` Martin Wilck
1 sibling, 0 replies; 3+ messages in thread
From: Martin Wilck @ 2025-01-14 21:45 UTC (permalink / raw)
To: Benjamin Marzinski, Christophe Varoqui; +Cc: device-mapper development
On Wed, 2025-01-08 at 19:06 -0500, Benjamin Marzinski wrote:
> _find_controllers() needs to free the udev device if it doesn't get
> added to a path. Otherwise it can leak memory whenever
> check_foreign()
> is called, causing multipathd's memory usage to continually grow.
>
> Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Reviewed-by: Martin Wilck <mwilck@suse.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-01-14 21:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-09 0:06 [PATCH] libmultipath/foreign: fix memory leak in nvme foreign handler Benjamin Marzinski
2025-01-09 0:26 ` Benjamin Marzinski
2025-01-14 21:45 ` Martin Wilck
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.