64 lines
1.8 KiB
Diff
64 lines
1.8 KiB
Diff
From ec1346acbe9e5f0fe16242fc61b85d81f84ee592 Mon Sep 17 00:00:00 2001
|
|
From: Andrea Claudi <aclaudi@redhat.com>
|
|
Date: Fri, 11 Dec 2020 19:53:02 +0100
|
|
Subject: devlink: fix memory leak in cmd_dev_flash()
|
|
|
|
nlg_ntf is dinamically allocated in mnlg_socket_open(), and is freed on
|
|
the out: return path. However, some error paths do not free it,
|
|
resulting in memory leak.
|
|
|
|
This commit fix this using mnlg_socket_close(), and reporting the
|
|
correct error number when required.
|
|
|
|
Fixes: 9b13cddfe268 ("devlink: implement flash status monitoring")
|
|
Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
|
|
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
|
Conflict:NA
|
|
Reference:https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit?id=ec1346acbe9e5f0fe16242fc61b85d81f84ee592
|
|
---
|
|
devlink/devlink.c | 13 ++++++++-----
|
|
1 file changed, 8 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/devlink/devlink.c b/devlink/devlink.c
|
|
index ca99732ef..43549965c 100644
|
|
--- a/devlink/devlink.c
|
|
+++ b/devlink/devlink.c
|
|
@@ -3371,19 +3371,21 @@ static int cmd_dev_flash(struct dl *dl)
|
|
|
|
err = _mnlg_socket_group_add(nlg_ntf, DEVLINK_GENL_MCGRP_CONFIG_NAME);
|
|
if (err)
|
|
- return err;
|
|
+ goto err_socket;
|
|
|
|
err = pipe(pipe_fds);
|
|
- if (err == -1)
|
|
- return -errno;
|
|
+ if (err == -1) {
|
|
+ err = -errno;
|
|
+ goto err_socket;
|
|
+ }
|
|
pipe_r = pipe_fds[0];
|
|
pipe_w = pipe_fds[1];
|
|
|
|
pid = fork();
|
|
if (pid == -1) {
|
|
- close(pipe_r);
|
|
close(pipe_w);
|
|
- return -errno;
|
|
+ err = -errno;
|
|
+ goto out;
|
|
} else if (!pid) {
|
|
/* In child, just execute the flash and pass returned
|
|
* value through pipe once it is done.
|
|
@@ -3412,6 +3414,7 @@ static int cmd_dev_flash(struct dl *dl)
|
|
err = _mnlg_socket_recv_run(dl->nlg, NULL, NULL);
|
|
out:
|
|
close(pipe_r);
|
|
+err_socket:
|
|
mnlg_socket_close(nlg_ntf);
|
|
return err;
|
|
}
|
|
--
|
|
cgit 1.2.3-korg
|
|
|