diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-11-01 10:29:29 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-11-01 13:31:02 +0200 |
| commit | 746dedd0692115e85edce087178d57893632fd16 (patch) | |
| tree | 7fc50cca5e20fbfcacf2f60354146cfe921ca794 /main/musl/0008-fix-if_indextoname-error-case.patch | |
| parent | 7171b9d299ed161ae8d0065ac7adc4cc8dadfd39 (diff) | |
| download | aports-746dedd0692115e85edce087178d57893632fd16.tar.bz2 aports-746dedd0692115e85edce087178d57893632fd16.tar.xz | |
main/musl: cherry-pick various upstream fixes, add pthread_set_attr_default_np
Diffstat (limited to 'main/musl/0008-fix-if_indextoname-error-case.patch')
| -rw-r--r-- | main/musl/0008-fix-if_indextoname-error-case.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/main/musl/0008-fix-if_indextoname-error-case.patch b/main/musl/0008-fix-if_indextoname-error-case.patch new file mode 100644 index 0000000000..e778996366 --- /dev/null +++ b/main/musl/0008-fix-if_indextoname-error-case.patch @@ -0,0 +1,37 @@ +From 32055d52ca43d867d6dbb763dc5213a8d3536a23 Mon Sep 17 00:00:00 2001 +From: Daniel Sabogal <dsabogalcc@gmail.com> +Date: Thu, 15 Sep 2016 11:27:30 -0400 +Subject: [PATCH 08/11] fix if_indextoname error case + +posix requires errno to be set to ENXIO if the interface does not exist. +linux returns ENODEV instead so we handle this. +--- + src/network/if_indextoname.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/network/if_indextoname.c b/src/network/if_indextoname.c +index 6ee7f13..3b368bf 100644 +--- 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) +@@ -14,5 +15,9 @@ char *if_indextoname(unsigned index, char *name) + 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); + } +-- +2.10.1 + |