Commit Graph

86 Commits

Author SHA1 Message Date
dc01e2cbfb add fallback emulation for accept4 on old kernels
the other atomic FD_CLOEXEC interfaces (dup3, pipe2, socket) already
had such emulation in place. the justification for doing the emulation
here is the same as for the other functions: it allows applications to
simply use accept4 rather than having to have their own fallback code
for ENOSYS/EINVAL (which one you get is arch-specific!) and there is
no reasonable way an application could benefit from knowing the
operation is emulated/non-atomic since there is no workaround at the
application level for non-atomicity (that is the whole reason these
interfaces were added).
2014-02-21 22:25:26 -05:00
3e02ce1b41 add ipv6 and icmpv6 to getprotoent-family functions
based on patch by orc.
2014-02-13 12:27:40 -05:00
eb375ef795 fix typo in table for getprotoent that caused out-of-bound reads
this was unlikely to lead to any crash or dangerous behavior, but
caused adjacent string constants to be treated as part of the
protocols table, possibly returning nonsensical results for unknown
protocol names/numbers or when getprotoent was called in a loop to
enumerate all protocols.
2014-02-13 12:24:40 -05:00
dbe221ecff fix argument types for legacy function inet_makeaddr
the type int was taken from seemingly erroneous man pages. glibc uses
in_addr_t (uint32_t), and semantically, the arguments should be
unsigned.
2014-01-06 22:17:24 -05:00
18144af297 implement legacy function herror
based on patch by Timo Teräs; greatly simplified to use fprintf.
2013-12-20 11:56:16 -05:00
571744447c include cleanups: remove unused headers and add feature test macros 2013-12-12 05:09:18 +00:00
ac45692a53 remove an unnecessary check in inet_pton
at most 4 hexadecimal digits are processed in one field so the
value cannot overflow. the netdb.h header was not used.
2013-12-12 04:18:34 +00:00
7603c5f127 support mix of IPv4 and v6 nameservers in resolv.conf
a v6 socket will only be used if there is at least one v6 nameserver
address. if the kernel lacks v6 support, the code will fall back to
using a v4 socket and requests to v6 servers will silently fail. when
using a v6 socket, v4 addresses are converted to v4-mapped form and
setsockopt is used to ensure that the v6 socket can accept both v4 and
v6 traffic (this is on-by-default on Linux but the default is
configurable in /proc and so it needs to be set explicitly on the
socket level). this scheme avoids increasing resource usage during
lookups and allows the existing network io loop to be used without
modification.

previously, nameservers whose address family did not match the address
family of the first-listed nameserver were simply ignored. prior to
recent __ipparse fixes, they were not ignored but erroneously parsed.
2013-11-30 13:33:29 -05:00
cabe9aa974 reject invalid address families in getaddrinfo
subsequent code assumes the address family requested is either
unspecified or one of IPv4/IPv6, and could malfunction if this
constraint is not met, so other address families should be explicitly
rejected.
2013-11-27 00:54:03 -05:00
2b1f2f146d remove duplicate includes from dynlink.c, strfmon.c and getaddrinfo.c 2013-11-25 23:34:10 +00:00
642936d6dd Fix dn_comp prototype and add stub
This function is used by ping6 from iputils.
2013-11-24 09:39:30 -05:00
4f6658b969 Fix dn_expand pointer following 2013-11-23 16:23:09 -05:00
ceb0ed9cf9 fix fd leak (missing close-on-exec) in getifaddrs 2013-11-20 20:34:33 -05:00
7b5beabceb fix regression in inet_aton due to misinterpretation of __ipparse return
inet_aton returns a boolean success value, whereas __ipparse returns 0
on success and -1 on failure. also change the conditional in inet_addr
to be consistent with other uses of __ipparse where only negative
values are treated as failure.
2013-11-02 04:07:12 -04:00
78f8891531 fix inet_pton
* parse IPv4 dotted-decimal correctly (without strtoul, no leading zeros)
* disallow single leading ':' in IPv6 address
* allow at most 4 hex digits in IPv6 address (according to RFC 2373)
* have enough hex fields in IPv4 mapped IPv6 address
* disallow leading zeros in IPv4 mapped IPv6 address
2013-10-23 01:49:14 +00:00
51c4e451db fix __ipparse to parse the generic numbers-and-dots IPv4 format correctly
* allow at most 4 parts
* bounds check the parts correctly
* disallow leading whitespace and sign
* check the address family before falling back to IPv6
2013-10-22 12:28:17 +00:00
59b8dc08f7 fix inet_aton to accept the generic "numbers-and-dots" IPv4 address format 2013-10-22 12:23:17 +00:00
bb93ac3358 split inet_addr and inet_ntoa back into their own files
despite being practically deprecated, these functions are still part
of the standard and thus cannot reside in a file that also contains
namespace pollution. this reverts some of the changes made in commit
e40f48a421.
2013-10-21 22:05:29 -04:00
38b9c02749 fix return value for inet_pton in ipv6 failure cases
in the case of input that does not match the expected form, the
correct return value is 0, not -1.
2013-10-19 22:36:30 -04:00
7211551e9f fix regression in dn_expand/reverse dns
off-by-one error copying the name components was yielding junk at the
beginning and truncating one character at the end (of every
component).
2013-08-23 21:25:01 -04:00
56b57f37a4 fix length computation in dn_expand
there are two possible points where the length is evaluated: either
the first 'compression' jump, or the null terminator if no jumps have
taken place yet. the previous code only measured the length of the
first component.
2013-08-14 18:18:46 -04:00
fcc522c923 de-duplicate dn_expand, fix return value and signature, clean up
the duplicate code in dn_expand and its incorrect return values are
both results of the history of the code: the version in __dns.c was
originally written with no awareness of the legacy resolver API, and
was later copy-and-paste duplicated to provide the legacy API.

this commit is the first of a series that will restructure the
internal dns code to share as much code as possible with the legacy
resolver API functions.

I have also removed the loop detection logic, since the output buffer
length limit naturally prevents loops. in order to avoid long runtime
when encountering a loop if the caller provided a ridiculously long
buffer, the caller-provided length is clamped at the maximum dns name
length.
2013-08-14 17:58:20 -04:00
f9dd79c8d1 fix undefined strcpy call in inet_ntop
source and dest arguments for strcpy cannot overlap, so memmove must
be used here. the length is already known from the above loop.
2013-07-25 03:30:24 -04:00
1cd417bdf1 make inet_ntop format v4-mapped ipv6 addresses properly
based on a patch by orc. POSIX actually fails to specify the format of
the ntop conversion; presumably, any output that will correctly
round-trip back via the (well-specified) pton operation is acceptable.
the new behavior is much more convenient than the old, however.

this patch also affects getnameinfo, which is implemented in terms of
inet_ntop and which is the preferred interface for performing this
conversion.

I've also removed some inexplicable cruft (filling the buffer with 'x'
before doing anything) whose origin I was unable to track down.
2013-07-25 03:20:02 -04:00
f5dfb45f78 make getaddrinfo with AF_UNSPEC and null host return both IPv4 and v6
based on a patch by orc, with indexing and flow control cleaned up a
little bit. this code is all going to be replaced at some point in the
near future.
2013-07-24 16:49:17 -04:00
0716b10ac8 fix missing SOCK_CLOEXEC in various functions that use sockets internally 2013-07-09 00:40:17 -04:00
fbcd82040c add stubs for additional legacy ether.h functions
these would not be expensive to actually implement, but reading
/etc/ethers does not sound like a particularly useful feature, so for
now I'm leaving them as stubs.
2013-07-01 13:50:02 -04:00
e40f48a421 implement inet_lnaof, inet_netof, and inet_makeaddr
also move all legacy inet_* functions into a single file to avoid
wasting object file and compile time overhead on them.

the added functions are legacy interfaces for working with classful
ipv4 network addresses. they have no modern usefulness whatsoever, but
some programs unconditionally use them anyway, and they're tiny.
2013-06-25 21:35:49 -04:00
83966b369d add ether_aton[_r] and ether_ntoa[_r] functions
based on patch by Strake with minor stylistic changes, and combined
into a single file. this patch remained open for a long time due to
some question as to whether ether_aton would be better implemented in
terms of sscanf, and it's time something was committed, so here it is.
2013-06-25 21:15:27 -04:00
9947ed5c20 getifaddrs: implement proper ipv6 netmasks 2013-04-09 16:52:13 +02:00
338cc31c4b getifaddrs: remove unused label 2013-04-06 00:04:52 +02:00
4af3ea789a getifaddrs: use if_nameindex to enumerate interfaces 2013-04-05 22:47:30 +02:00
69a1983872 getifaddrs: one less indent level 2013-04-05 22:08:03 +02:00
c82f53f67c getifaddrs: less malloc 2013-04-05 22:06:35 +02:00
202db37a6f add getifaddrs
supports ipv4 and ipv6, but not the "extended" usage where
usage statistics and other info are assigned to ifa_data members
of duplicate entries with AF_PACKET family.
2013-04-05 19:36:51 +02:00
b6f9941201 implement dn_skipname (legacy resolver function) 2013-04-04 22:36:30 -04:00
a47ad3ebce dynamically allocate storage for gethostby* buffers
this change shaves ~1k off libc.so bss size, and also avoids hard
errors in the case where the static buffer was not large enough to
hold the result.

this whole framework is really ugly and might should be replaced or at
least heavily overhauled when some changes/factorizations are made to
getaddrinfo internals in the future.
2013-02-02 02:07:38 -05:00
c0193550a0 fix blank ai_canonname from getaddrinfo for non-CNAMEs 2013-02-02 01:59:53 -05:00
b0302863a3 fix memory leak due to double call to getaddrinfo in gethostbyname* 2013-02-02 01:32:12 -05:00
70b584bc94 fix error returns in gethostby*_r functions
they're supposed to return an error code rather than using errno.
2013-02-02 01:31:10 -05:00
36d7303878 add inet_network (required for wine) 2012-12-19 07:32:38 +01:00
e8a0b27a71 improve SOCK_NONBLOCK/SOCK_CLOEXEC fallback code
checking for EINVAL should be sufficient, but qemu user emulation
returns EPROTONOSUPPORT in some of the failure cases, and it seems
conceivable that other kernels doing linux-emulation could make the
same mistake. since DNS lookups and other important code might break
if the fallback does not get invoked, be extra careful and check for
either error.

note that it's important NOT to perform the fallback code on other
errors such as resource-exhaustion cases, since the fallback is not
atomic and will lead to file-descriptor leaks in multi-threaded
programs that use exec. the fallback code is only "safe" to run when
the initial failure is caused by the application's choice of
arguments, not the system state.
2012-11-05 14:30:15 -05:00
f2d08cf755 fix some more O_CLOEXEC/SOCK_CLOEXEC issues 2012-09-29 17:59:50 -04:00
dc62790dee move accept4, dup3, and pipe2 to non-linux-specific locations
these interfaces have been adopted by the Austin Group for inclusion
in the next version of POSIX.
2012-09-29 17:40:42 -04:00
79a5e73e51 emulate SOCK_CLOEXEC and SOCK_NONBLOCK for old (pre-2.6.27) kernels
also update syslog to use SOCK_CLOEXEC rather than separate fcntl
step, to make it safe in multithreaded programs that run external
programs.

emulation is not atomic; it could be made atomic by holding a lock on
forking during the operation, but this seems like overkill. my goal is
not to achieve perfect behavior on old kernels (which have plenty of
other imperfect behavior already) but to avoid catastrophic breakage
in (1) syslog, which would give no output on old kernels with the
change to use SOCK_CLOEXEC, and (2) programs built on a new kernel
where configure scripts detected a working SOCK_CLOEXEC, which later
get run on older kernels (they may otherwise fail to work completely).
2012-09-29 17:36:27 -04:00
4b49060da0 fix getaddrinfo to accept port 0 (zero)
new behavior can be summarized as:
inputs that parse completely as a decimal number are treated as one,
and rejected only if the result is out of 16-bit range.
inputs that do not parse as a decimal number (where strtoul leaves
anything left over in the input) are searched in /etc/services.
2012-09-22 16:19:06 -04:00
400c5e5c83 use restrict everywhere it's required by c99 and/or posix 2008
to deal with the fact that the public headers may be used with pre-c99
compilers, __restrict is used in place of restrict, and defined
appropriately for any supported compiler. we also avoid the form
[restrict] since older versions of gcc rejected it due to a bug in the
original c99 standard, and instead use the form *restrict.
2012-09-06 22:44:55 -04:00
845a5e69fa remove scanf dependency from getaddrinfo /etc/services support 2012-07-22 22:09:45 -04:00
efe72c5619 getaddrinfo /etc/services lookup support 2012-07-22 19:42:44 -04:00
75fff40b9b make getservby*_r return error code rather than -1 (and using errno)
untested but should be correct..
2012-07-22 18:49:49 -04:00