don't treat numeric port strings as servent records in getservby*()

[musl] / src / network / if_indextoname.c

diff --git a/src/network/if_indextoname.c b/src/network/if_indextoname.c
index f18f17a..3b368bf 100644 (file)
--- a/src/network/if_indextoname.c
+++ b/src/network/if_indextoname.c
@@ -3,6 +3,7 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <string.h>
+#include <errno.h>
 #include "syscall.h"
 
 char *if_indextoname(unsigned index, char *name)
@@ -10,9 +11,13 @@ char *if_indextoname(unsigned index, char *name)
        struct ifreq ifr;
        int fd, r;
 
-       if ((fd = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0) return 0;
+       if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) return 0;
        ifr.ifr_ifindex = index;
        r = ioctl(fd, SIOCGIFNAME, &ifr);
        __syscall(SYS_close, fd);
-       return r < 0 ? 0 : strncpy(name, ifr.ifr_name, IF_NAMESIZE);
+       if (r < 0) {
+               if (errno == ENODEV) errno = ENXIO;
+               return 0;
+       }
+       return strncpy(name, ifr.ifr_name, IF_NAMESIZE);
 }