sync some patches from upstream
(cherry picked from commit 1791d0ebea8815724aa7f1c8d066ce7036a8778c)
This commit is contained in:
yangl777
openeuler-sync-bot
parent
1e83ace501
commit
d16b15e4bb
113
backport-fix-fd-leak-when-playing-with-netns.patch
Normal file
113
backport-fix-fd-leak-when-playing-with-netns.patch
Normal file
@ -0,0 +1,113 @@
|
||||
From 57daf8ff8c6c357a5a083657e5b03d2883cbc4f9 Mon Sep 17 00:00:00 2001
|
||||
From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
|
||||
Date: Wed, 18 Sep 2024 18:49:41 +0200
|
||||
Subject: [PATCH] iplink: fix fd leak when playing with netns
|
||||
|
||||
The command 'ip link set foo netns mynetns' opens a file descriptor to fill
|
||||
the netlink attribute IFLA_NET_NS_FD. This file descriptor is never closed.
|
||||
When batch mode is used, the number of file descriptor may grow greatly and
|
||||
reach the maximum file descriptor number that can be opened.
|
||||
|
||||
This fd can be closed only after the netlink answer. Moreover, a second
|
||||
fd could be opened because some (struct link_util)->parse_opt() handlers
|
||||
call iplink_parse().
|
||||
|
||||
Let's add a helper to manage these fds:
|
||||
- open_fds_add() stores a fd, up to 5 (arbitrary choice, it seems enough);
|
||||
- open_fds_close() closes all stored fds.
|
||||
|
||||
Fixes: 0dc34c7713bb ("iproute2: Add processless network namespace support")
|
||||
Reported-by: Alexandre Ferrieux <alexandre.ferrieux@orange.com>
|
||||
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
|
||||
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
||||
|
||||
Reference:https://github.com/iproute2/iproute2/commit/57daf8ff8c6c357a5a083657e5b03d2883cbc4f9
|
||||
Conflict:Context adaptation
|
||||
---
|
||||
include/utils.h | 3 +++
|
||||
ip/iplink.c | 9 ++++++---
|
||||
lib/utils.c | 23 +++++++++++++++++++++++
|
||||
3 files changed, 32 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/include/utils.h b/include/utils.h
|
||||
index 6a8fc19..78f55fa 100644
|
||||
--- a/include/utils.h
|
||||
+++ b/include/utils.h
|
||||
@@ -370,4 +370,7 @@ void inc_indent(struct indent_mem *mem);
|
||||
void dec_indent(struct indent_mem *mem);
|
||||
void print_indent(struct indent_mem *mem);
|
||||
|
||||
+int open_fds_add(int fd);
|
||||
+void open_fds_close(void);
|
||||
+
|
||||
#endif /* __UTILS_H__ */
|
||||
diff --git a/ip/iplink.c b/ip/iplink.c
|
||||
index 29cf685..9cd2033 100644
|
||||
--- a/ip/iplink.c
|
||||
+++ b/ip/iplink.c
|
||||
@@ -684,9 +684,11 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, char **type)
|
||||
if (netns != -1)
|
||||
duparg("netns", *argv);
|
||||
netns = netns_get_fd(*argv);
|
||||
- if (netns >= 0)
|
||||
+ if (netns >= 0) {
|
||||
+ open_fds_add(netns);
|
||||
addattr_l(&req->n, sizeof(*req), IFLA_NET_NS_FD,
|
||||
&netns, 4);
|
||||
+ }
|
||||
else if (get_integer(&netns, *argv, 0) == 0)
|
||||
addattr_l(&req->n, sizeof(*req),
|
||||
IFLA_NET_NS_PID, &netns, 4);
|
||||
@@ -1112,8 +1114,9 @@ static int iplink_modify(int cmd, unsigned int flags, int argc, char **argv)
|
||||
"Not enough information: \"type\" argument is required\n");
|
||||
return -1;
|
||||
}
|
||||
-
|
||||
- if (rtnl_talk(&rth, &req.n, NULL) < 0)
|
||||
+ ret = rtnl_talk(&rth, &req.n, NULL);
|
||||
+ open_fds_close();
|
||||
+ if (ret < 0)
|
||||
return -2;
|
||||
|
||||
/* remove device from cache; next use can refresh with new data */
|
||||
diff --git a/lib/utils.c b/lib/utils.c
|
||||
index 245a529..a104ae4 100644
|
||||
--- a/lib/utils.c
|
||||
+++ b/lib/utils.c
|
||||
@@ -50,6 +50,9 @@ int timestamp_short;
|
||||
int pretty;
|
||||
const char *_SL_ = "\n";
|
||||
|
||||
+static int open_fds[5];
|
||||
+static int open_fds_cnt;
|
||||
+
|
||||
static int af_byte_len(int af);
|
||||
static void print_time(char *buf, int len, __u32 time);
|
||||
static void print_time64(char *buf, int len, __s64 time);
|
||||
@@ -1960,3 +1963,23 @@ void print_indent(struct indent_mem *mem)
|
||||
if (mem->indent_level)
|
||||
printf("%s", mem->indent_str);
|
||||
}
|
||||
+
|
||||
+int open_fds_add(int fd)
|
||||
+{
|
||||
+ if (open_fds_cnt >= ARRAY_SIZE(open_fds))
|
||||
+ return -1;
|
||||
+
|
||||
+ open_fds[open_fds_cnt++] = fd;
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+void open_fds_close(void)
|
||||
+{
|
||||
+ int i;
|
||||
+
|
||||
+ for (i = 0; i < open_fds_cnt; i++)
|
||||
+ close(open_fds[i]);
|
||||
+
|
||||
+ open_fds_cnt = 0;
|
||||
+}
|
||||
--
|
||||
2.43.0
|
||||
|
||||
11
iproute.spec
11
iproute.spec
@ -2,7 +2,7 @@
|
||||
Name: iproute
|
||||
Version: 5.15.0
|
||||
Epoch: 1
|
||||
Release: 23
|
||||
Release: 24
|
||||
Summary: Linux network configuration utilities
|
||||
License: GPLv2+ and Public Domain
|
||||
URL: https://kernel.org/pub/linux/utils/net/iproute2/
|
||||
@ -73,7 +73,8 @@ Patch6055: backport-ctrl-Fix-fd-leak-in-ctrl_listen.patch
|
||||
Patch6056: backport-ss-fix-expired-time-format-of-timer.patch
|
||||
Patch6057: backport-route-filter-by-interface-on-multipath-routes.patch
|
||||
Patch6058: backport-lib-names-check-calloc-return-value-in-db_names_alloc.patch
|
||||
Patch6059: backport-dcb-unblock-mnl_socket_recvfrom-if-not-message-recei.patch
|
||||
Patch6059: backport-dcb-unblock-mnl_socket_recvfrom-if-not-message-recei.patch
|
||||
Patch6060: backport-fix-fd-leak-when-playing-with-netns.patch
|
||||
|
||||
Patch9000: feature-iproute-add-support-for-ipvlan-l2e-mode.patch
|
||||
Patch9001: bugfix-iproute2-cancel-some-test-cases.patch
|
||||
@ -155,6 +156,12 @@ install -m 0644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a
|
||||
%{_mandir}/*
|
||||
|
||||
%changelog
|
||||
* Tue Apr 15 2025 yanglu <yanglu72@h-partners.com> - 1:5.15.0-24
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:fix fd leak when playing with netns
|
||||
|
||||
* Mon Mar 24 2025 chenhao <chenhao418@huawei.com> - 1:5.15.0-23
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user