packages/iproute
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!128 fix ipnetns attach failed

Browse Source 
From: @jiangheng12 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw
This commit is contained in:
openeuler-ci-bot 2023-03-03 01:11:53 +00:00 committed by Gitee
commit 829d4e96c6
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bugfix-iproute2-change-proc-to-ipnetnsproc-which-is-private.patch
View File

@ -16,9 +16,8 @@ Signed-off-by: Minhua Chen <chenminhua1@huawei.com>
---
ip/ipnetns.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 64 insertions(+), 8 deletions(-)
diff --git a/ip/ipnetns.c b/ip/ipnetns.c
index fc58a04..fedc3db 100644
index 83a9b99..2dde78a 100644
--- a/ip/ipnetns.c
+++ b/ip/ipnetns.c
@@ -24,6 +24,62 @@
@ -84,7 +83,7 @@ index fc58a04..fedc3db 100644
static int usage(void)
{
fprintf(stderr,
@@ -589,10 +645,9 @@ static int netns_pids(int argc, char **argv)
@@ -598,10 +654,9 @@ static int netns_pids(int argc, char **argv)
strerror(errno));
return -1;
}
@ -97,7 +96,7 @@ index fc58a04..fedc3db 100644
return -1;
}
while ((entry = readdir(dir))) {
@@ -601,8 +656,7 @@ static int netns_pids(int argc, char **argv)
@@ -610,8 +665,7 @@ static int netns_pids(int argc, char **argv)
if (!is_pid(entry->d_name))
continue;
@ -107,7 +106,7 @@ index fc58a04..fedc3db 100644
if (stat(pid_net_path, &st) != 0)
continue;
if ((st.st_dev == netst.st_dev) &&
@@ -625,7 +679,7 @@ int netns_identify_pid(const char *pidstr, char *name, int len)
@@ -634,7 +688,7 @@ int netns_identify_pid(const char *pidstr, char *name, int len)
name[0] = '\0';
@ -116,20 +115,18 @@ index fc58a04..fedc3db 100644
netns = open(net_path, O_RDONLY);
if (netns < 0) {
fprintf(stderr, "Cannot open network namespace: %s\n",
@@ -856,9 +910,11 @@ static int netns_add(int argc, char **argv, bool create)
@@ -910,9 +964,9 @@ static int netns_add(int argc, char **argv, bool create)
goto out_delete;
}
- strcpy(proc_path, "/proc/self/ns/net");
+ snprintf(proc_path, sizeof(proc_path), "/%s/self/ns/net", get_proc_string());
} else {
- snprintf(proc_path, sizeof(proc_path), "/proc/%d/ns/net", pid);
+ snprintf(proc_path, sizeof(proc_path), "/%s/%d/ns/net", get_proc_string(), pid);
}
/* Bind the netns last so I can watch for it */
- if (mount(proc_path, netns_path, "none", MS_BIND, NULL) < 0) {
+ char pid_net_path[MAXPATHLEN];
+ snprintf(pid_net_path, sizeof(pid_net_path), "%s/self/ns/net", get_proc_string());
+ if (mount(pid_net_path, netns_path, "none", MS_BIND, NULL) < 0) {
fprintf(stderr, "Bind %s -> %s failed: %s\n",
- proc_path, netns_path, strerror(errno));
+ pid_net_path, netns_path, strerror(errno));
goto out_delete;
}
netns_restore();
--
1.8.3.1

8
iproute.spec
View File

@ -1,6 +1,6 @@
Name: iproute
Version: 5.5.0
Release: 12
Release: 13
Summary: Linux network configuration utilities
License: GPLv2+ and Public Domain
URL: https://kernel.org/pub/linux/utils/net/iproute2/
@ -101,6 +101,12 @@ install -m 0644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a
%{_mandir}/*
%changelog
* Thu Mar 02 2023 jiangheng <jiangheng14@huawei.com> - 5.5.0-13
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix ip netns attach failed
* Fri Feb 17 2023 gaoxingwang <gaoxingwang1@huawei.com> - 5.5.0-12
- Type:bugfix
- ID:NA