| Message ID | c6b4c6811f761103ae79ec8a06ae694b65f40317.1613916538.git.aclaudi@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Stephen Hemminger |
| Headers | show |
| Series | [iproute2] lib/namespace: fix ip -all netns return code | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
diff --git a/lib/namespace.c b/lib/namespace.c index 06ae0a48..45a7dedd 100644 --- a/lib/namespace.c +++ b/lib/namespace.c @@ -122,8 +122,14 @@ int netns_foreach(int (*func)(char *nsname, void *arg), void *arg) struct dirent *entry; dir = opendir(NETNS_RUN_DIR); - if (!dir) + if (!dir) { + if (errno == ENOENT) + return 0; + + fprintf(stderr, "Failed to open directory %s: %s\n", + NETNS_RUN_DIR, strerror(errno)); return -1; + } while ((entry = readdir(dir)) != NULL) { if (strcmp(entry->d_name, ".") == 0)
When ip -all netns {del,exec} are called and no netns is present, ip exit with status 0. However this does not happen if no netns has been created since boot time: in that case, indeed, the NETNS_RUN_DIR is not present and netns_foreach() exit with code 1. $ ls /var/run/netns ls: cannot access '/var/run/netns': No such file or directory $ ip -all netns exec ip link show $ echo $? 1 $ ip -all netns del $ echo $? 1 $ ip netns add test $ ip netns del test $ ip -all netns del $ echo $? 0 $ ls -a /var/run/netns . .. This leaves us in the unpleasant situation where the same command, when no netns is present, does the same stuff (in this case, nothing), but exit with two different statuses. Fix this treating ENOENT in a different way from other errors, similarly to what we already do in ipnetns.c netns_identify_pid() Fixes: e998e118ddc3 ("lib: Exec func on each netns") Reported-by: Jianlin Shi <jishi@redhat.com> Signed-off-by: Andrea Claudi <aclaudi@redhat.com> --- lib/namespace.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)