Message ID | 1474362542-5506-1-git-send-email-zlpnobody@gmail.com |
---|---|
State | Accepted, archived |
Delegated to: | stephen hemminger |
Headers | show |
Le 20/09/2016 à 11:09, Liping Zhang a écrit : > From: Liping Zhang <liping.zhang@spreadtrum.com> > > In ip monitor, netns_map_init will check getnsid is supported or not. > But when /proc/self/ns/net does not exist, we just print out error > messages and exit. So user cannot use ip monitor anymore when > CONFIG_NET_NS is disabled: > # ip monitor > open("/proc/self/ns/net"): No such file or directory > > If open "/proc/self/ns/net" failed, set have_rtnl_getnsid to false. > > Fixes: d652ccbf8195 ("netns: allow to dump and monitor nsid") > Signed-off-by: Liping Zhang <liping.zhang@spreadtrum.com> Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
On Tue, 20 Sep 2016 02:09:02 -0700 Liping Zhang <zlpnobody@gmail.com> wrote: > From: Liping Zhang <liping.zhang@spreadtrum.com> > > In ip monitor, netns_map_init will check getnsid is supported or not. > But when /proc/self/ns/net does not exist, we just print out error > messages and exit. So user cannot use ip monitor anymore when > CONFIG_NET_NS is disabled: > # ip monitor > open("/proc/self/ns/net"): No such file or directory > > If open "/proc/self/ns/net" failed, set have_rtnl_getnsid to false. > > Fixes: d652ccbf8195 ("netns: allow to dump and monitor nsid") > Signed-off-by: Liping Zhang <liping.zhang@spreadtrum.com> Makes sense. Applied.
diff --git a/ip/ipnetns.c b/ip/ipnetns.c index af87065..ccc652c 100644 --- a/ip/ipnetns.c +++ b/ip/ipnetns.c @@ -72,8 +72,8 @@ static int ipnetns_have_nsid(void) if (have_rtnl_getnsid < 0) { fd = open("/proc/self/ns/net", O_RDONLY); if (fd < 0) { - perror("open(\"/proc/self/ns/net\")"); - exit(1); + have_rtnl_getnsid = 0; + return 0; } addattr32(&req.n, 1024, NETNSA_FD, fd);