45 lines
1.1 KiB
Diff
45 lines
1.1 KiB
Diff
From 575322b09c3c6bc1806f2faa31edcfb64df302bb Mon Sep 17 00:00:00 2001
|
|
From: Maxim Petrov <mmrmaximuzz@gmail.com>
|
|
Date: Sun, 15 Oct 2023 16:32:12 +0200
|
|
Subject: [PATCH] ip: fix memory leak in 'ip maddr show'
|
|
|
|
In `read_dev_mcast`, the list of ma_info is allocated, but not cleared
|
|
after use. Free the list in the end to make valgrind happy.
|
|
|
|
Detected by valgrind: "valgrind ./ip/ip maddr show"
|
|
|
|
Signed-off-by: Maxim Petrov <mmrmaximuzz@gmail.com>
|
|
---
|
|
ip/ipmaddr.c | 11 +++++++++++
|
|
1 file changed, 11 insertions(+)
|
|
|
|
diff --git a/ip/ipmaddr.c b/ip/ipmaddr.c
|
|
index 176f6ab74..2418b3031 100644
|
|
--- a/ip/ipmaddr.c
|
|
+++ b/ip/ipmaddr.c
|
|
@@ -79,6 +79,16 @@ static void maddr_ins(struct ma_info **lst, struct ma_info *m)
|
|
*lst = m;
|
|
}
|
|
|
|
+static void maddr_clear(struct ma_info *lst)
|
|
+{
|
|
+ struct ma_info *mp;
|
|
+
|
|
+ while ((mp = lst) != NULL) {
|
|
+ lst = mp->next;
|
|
+ free(mp);
|
|
+ }
|
|
+}
|
|
+
|
|
static void read_dev_mcast(struct ma_info **result_p)
|
|
{
|
|
char buf[256];
|
|
@@ -286,6 +296,7 @@ static int multiaddr_list(int argc, char **argv)
|
|
if (!filter.family || filter.family == AF_INET6)
|
|
read_igmp6(&list);
|
|
print_mlist(stdout, list);
|
|
+ maddr_clear(list);
|
|
return 0;
|
|
}
|
|
|