149 lines
4.8 KiB
Diff
149 lines
4.8 KiB
Diff
From 2c3ebb2ae08a634615e56303d784ddb366e47f04 Mon Sep 17 00:00:00 2001
|
|
From: heminhong <heminhong@kylinos.cn>
|
|
Date: Thu, 16 Nov 2023 11:13:08 +0800
|
|
Subject: [PATCH] iproute2: prevent memory leak
|
|
|
|
When the return value of rtnl_talk() is not less than 0,
|
|
'answer' will be allocated. The 'answer' should be free
|
|
after using, otherwise it will cause memory leak.
|
|
|
|
Fixes: a066cc6623e1 ("gre/gre6: Unify local/remote endpoint address parsing")
|
|
Signed-off-by: heminhong <heminhong@kylinos.cn>
|
|
Reviewed-by: Andrea Claudi <aclaudi@redhat.com>
|
|
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
|
---
|
|
ip/link_gre.c | 3 ++-
|
|
ip/link_gre6.c | 3 ++-
|
|
ip/link_ip6tnl.c | 3 ++-
|
|
ip/link_iptnl.c | 3 ++-
|
|
ip/link_vti.c | 3 ++-
|
|
ip/link_vti6.c | 3 ++-
|
|
6 files changed, 12 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/ip/link_gre.c b/ip/link_gre.c
|
|
index 74a5b5e96..6d71864c1 100644
|
|
--- a/ip/link_gre.c
|
|
+++ b/ip/link_gre.c
|
|
@@ -76,7 +76,7 @@ static int gre_parse_opt(struct link_util *lu, int argc, char **argv,
|
|
.i.ifi_family = preferred_family,
|
|
.i.ifi_index = ifi->ifi_index,
|
|
};
|
|
- struct nlmsghdr *answer;
|
|
+ struct nlmsghdr *answer = NULL;
|
|
struct rtattr *tb[IFLA_MAX + 1];
|
|
struct rtattr *linkinfo[IFLA_INFO_MAX+1];
|
|
struct rtattr *greinfo[IFLA_GRE_MAX + 1];
|
|
@@ -113,6 +113,7 @@ static int gre_parse_opt(struct link_util *lu, int argc, char **argv,
|
|
get_failed:
|
|
fprintf(stderr,
|
|
"Failed to get existing tunnel info.\n");
|
|
+ free(answer);
|
|
return -1;
|
|
}
|
|
|
|
diff --git a/ip/link_gre6.c b/ip/link_gre6.c
|
|
index b03bd65ad..4d1c65748 100644
|
|
--- a/ip/link_gre6.c
|
|
+++ b/ip/link_gre6.c
|
|
@@ -79,7 +79,7 @@ static int gre_parse_opt(struct link_util *lu, int argc, char **argv,
|
|
.i.ifi_family = preferred_family,
|
|
.i.ifi_index = ifi->ifi_index,
|
|
};
|
|
- struct nlmsghdr *answer;
|
|
+ struct nlmsghdr *answer = NULL;
|
|
struct rtattr *tb[IFLA_MAX + 1];
|
|
struct rtattr *linkinfo[IFLA_INFO_MAX+1];
|
|
struct rtattr *greinfo[IFLA_GRE_MAX + 1];
|
|
@@ -115,6 +115,7 @@ static int gre_parse_opt(struct link_util *lu, int argc, char **argv,
|
|
get_failed:
|
|
fprintf(stderr,
|
|
"Failed to get existing tunnel info.\n");
|
|
+ free(answer);
|
|
return -1;
|
|
}
|
|
|
|
diff --git a/ip/link_ip6tnl.c b/ip/link_ip6tnl.c
|
|
index b27d696f5..3a30dca93 100644
|
|
--- a/ip/link_ip6tnl.c
|
|
+++ b/ip/link_ip6tnl.c
|
|
@@ -72,7 +72,7 @@ static int ip6tunnel_parse_opt(struct link_util *lu, int argc, char **argv,
|
|
.i.ifi_family = preferred_family,
|
|
.i.ifi_index = ifi->ifi_index,
|
|
};
|
|
- struct nlmsghdr *answer;
|
|
+ struct nlmsghdr *answer = NULL;
|
|
struct rtattr *tb[IFLA_MAX + 1];
|
|
struct rtattr *linkinfo[IFLA_INFO_MAX+1];
|
|
struct rtattr *iptuninfo[IFLA_IPTUN_MAX + 1];
|
|
@@ -101,6 +101,7 @@ static int ip6tunnel_parse_opt(struct link_util *lu, int argc, char **argv,
|
|
get_failed:
|
|
fprintf(stderr,
|
|
"Failed to get existing tunnel info.\n");
|
|
+ free(answer);
|
|
return -1;
|
|
}
|
|
|
|
diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c
|
|
index 1315aebe9..879202f71 100644
|
|
--- a/ip/link_iptnl.c
|
|
+++ b/ip/link_iptnl.c
|
|
@@ -73,7 +73,7 @@ static int iptunnel_parse_opt(struct link_util *lu, int argc, char **argv,
|
|
.i.ifi_family = preferred_family,
|
|
.i.ifi_index = ifi->ifi_index,
|
|
};
|
|
- struct nlmsghdr *answer;
|
|
+ struct nlmsghdr *answer = NULL;
|
|
struct rtattr *tb[IFLA_MAX + 1];
|
|
struct rtattr *linkinfo[IFLA_INFO_MAX+1];
|
|
struct rtattr *iptuninfo[IFLA_IPTUN_MAX + 1];
|
|
@@ -105,6 +105,7 @@ static int iptunnel_parse_opt(struct link_util *lu, int argc, char **argv,
|
|
get_failed:
|
|
fprintf(stderr,
|
|
"Failed to get existing tunnel info.\n");
|
|
+ free(answer);
|
|
return -1;
|
|
}
|
|
|
|
diff --git a/ip/link_vti.c b/ip/link_vti.c
|
|
index 509432543..7a95dc02d 100644
|
|
--- a/ip/link_vti.c
|
|
+++ b/ip/link_vti.c
|
|
@@ -48,7 +48,7 @@ static int vti_parse_opt(struct link_util *lu, int argc, char **argv,
|
|
.i.ifi_family = preferred_family,
|
|
.i.ifi_index = ifi->ifi_index,
|
|
};
|
|
- struct nlmsghdr *answer;
|
|
+ struct nlmsghdr *answer = NULL;
|
|
struct rtattr *tb[IFLA_MAX + 1];
|
|
struct rtattr *linkinfo[IFLA_INFO_MAX+1];
|
|
struct rtattr *vtiinfo[IFLA_VTI_MAX + 1];
|
|
@@ -69,6 +69,7 @@ static int vti_parse_opt(struct link_util *lu, int argc, char **argv,
|
|
get_failed:
|
|
fprintf(stderr,
|
|
"Failed to get existing tunnel info.\n");
|
|
+ free(answer);
|
|
return -1;
|
|
}
|
|
|
|
diff --git a/ip/link_vti6.c b/ip/link_vti6.c
|
|
index 5764221eb..aaf701d33 100644
|
|
--- a/ip/link_vti6.c
|
|
+++ b/ip/link_vti6.c
|
|
@@ -50,7 +50,7 @@ static int vti6_parse_opt(struct link_util *lu, int argc, char **argv,
|
|
.i.ifi_family = preferred_family,
|
|
.i.ifi_index = ifi->ifi_index,
|
|
};
|
|
- struct nlmsghdr *answer;
|
|
+ struct nlmsghdr *answer = NULL;
|
|
struct rtattr *tb[IFLA_MAX + 1];
|
|
struct rtattr *linkinfo[IFLA_INFO_MAX+1];
|
|
struct rtattr *vtiinfo[IFLA_VTI_MAX + 1];
|
|
@@ -71,6 +71,7 @@ static int vti6_parse_opt(struct link_util *lu, int argc, char **argv,
|
|
get_failed:
|
|
fprintf(stderr,
|
|
"Failed to get existing tunnel info.\n");
|
|
+ free(answer);
|
|
return -1;
|
|
}
|
|
|