mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-11 15:50:06 +00:00
16b293a7a6
[Fixes BZ #14308, #12994, #13651] AF_UNSPEC results in sending two queries in parallel, one for the A record and the other for the AAAA record. If one of these is a referral, then the query fails, which is wrong. It should return at least the one successful response. The fix has two parts. The first part makes the referral fall back to the SERVFAIL path, which results in using the successful response. There is a bug in that path however, due to which the second part is necessary. The bug here is that if the first response is a failure and the second succeeds, __libc_res_nsearch does not detect that and assumes a failure. The case where the first response is a success and the second fails, works correctly. This condition is produced by buggy routers, so here's a crude interposable library that can simulate such a condition. The library overrides the recvfrom syscall and modifies the header of the packet received to reproduce this scenario. It has two key variables: mod_packet and first_error. The mod_packet variable when set to 0, results in odd packets being modified to be a referral. When set to 1, even packets are modified to be a referral. The first_error causes the first response to be a failure so that a domain-appended search is performed to test the second part of the __libc_nsearch fix. The driver for this fix is a simple getaddrinfo program that does an AF_UNSPEC query. I have omitted this since it should be easy to implement. I have tested this on x86_64. The interceptor library source: /* Override recvfrom and modify the header of the first DNS response to make it a referral and reproduce bz #845218. We have to resort to this ugly hack because we cannot make bind return the buggy response of a referral for the AAAA record and an authoritative response for the A record. */ #define _GNU_SOURCE #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdio.h> #include <stdbool.h> #include <endian.h> #include <dlfcn.h> #include <stdlib.h> /* Lifted from resolv/arpa/nameser_compat.h. */ typedef struct { unsigned id :16; /*%< query identification number */ #if BYTE_ORDER == BIG_ENDIAN /* fields in third byte */ unsigned qr: 1; /*%< response flag */ unsigned opcode: 4; /*%< purpose of message */ unsigned aa: 1; /*%< authoritive answer */ unsigned tc: 1; /*%< truncated message */ unsigned rd: 1; /*%< recursion desired */ /* fields * in * fourth * byte * */ unsigned ra: 1; /*%< recursion available */ unsigned unused :1; /*%< unused bits (MBZ as of 4.9.3a3) */ unsigned ad: 1; /*%< authentic data from named */ unsigned cd: 1; /*%< checking disabled by resolver */ unsigned rcode :4; /*%< response code */ #endif #if BYTE_ORDER == LITTLE_ENDIAN || BYTE_ORDER == PDP_ENDIAN /* fields * in * third * byte * */ unsigned rd :1; /*%< recursion desired */ unsigned tc :1; /*%< truncated message */ unsigned aa :1; /*%< authoritive answer */ unsigned opcode :4; /*%< purpose of message */ unsigned qr :1; /*%< response flag */ /* fields * in * fourth * byte * */ unsigned rcode :4; /*%< response code */ unsigned cd: 1; /*%< checking disabled by resolver */ unsigned ad: 1; /*%< authentic data from named */ unsigned unused :1; /*%< unused bits (MBZ as of 4.9.3a3) */ unsigned ra :1; /*%< recursion available */ #endif /* remaining * bytes * */ unsigned qdcount :16; /*%< number of question entries */ unsigned ancount :16; /*%< number of answer entries */ unsigned nscount :16; /*%< number of authority entries */ unsigned arcount :16; /*%< number of resource entries */ } HEADER; static int done = 0; /* Packets to modify. 0 for the odd packets and 1 for even packets. */ static const int mod_packet = 0; /* Set to true if the first request should result in an error, resulting in a search query. */ static bool first_error = true; static ssize_t (*real_recvfrom) (int sockfd, void *buf, size_t len, int flags, struct sockaddr *src_addr, socklen_t *addrlen); void __attribute__ ((constructor)) init (void) { real_recvfrom = dlsym (RTLD_NEXT, "recvfrom"); if (real_recvfrom == NULL) { printf ("Failed to get reference to recvfrom: %s\n", dlerror ()); printf ("Cannot simulate test\n"); abort (); } } /* Modify the second packet that we receive to set the header in a manner as to reproduce BZ #845218. */ static void mod_buf (HEADER *h, int port) { if (done % 2 == mod_packet || (first_error && done == 1)) { printf ("(Modifying header)"); if (first_error && done == 1) h->rcode = 3; else h->rcode = 0; /* NOERROR == 0. */ h->ancount = 0; h->aa = 0; h->ra = 0; h->arcount = 0; } done++; } ssize_t recvfrom (int sockfd, void *buf, size_t len, int flags, struct sockaddr *src_addr, socklen_t *addrlen) { ssize_t ret = real_recvfrom (sockfd, buf, len, flags, src_addr, addrlen); int port = htons (((struct sockaddr_in *) src_addr)->sin_port); struct in_addr addr = ((struct sockaddr_in *) src_addr)->sin_addr; const char *host = inet_ntoa (addr); printf ("\n*** From %s:%d: ", host, port); mod_buf (buf, port); printf ("returned %zd\n", ret); return ret; } |
||
---|---|---|
.. | ||
arpa | ||
nss_dns | ||
sys | ||
Banner | ||
base64.c | ||
Depend | ||
ga_test.c | ||
gai_cancel.c | ||
gai_error.c | ||
gai_misc.c | ||
gai_misc.h | ||
gai_notify.c | ||
gai_sigqueue.c | ||
gai_suspend.c | ||
getaddrinfo_a.c | ||
gethnamaddr.c | ||
herror.c | ||
inet_addr.c | ||
inet_net_ntop.c | ||
inet_net_pton.c | ||
inet_neta.c | ||
inet_ntop.c | ||
inet_pton.c | ||
Makefile | ||
mapv4v6addr.h | ||
mapv4v6hostent.h | ||
netdb.h | ||
ns_date.c | ||
ns_name.c | ||
ns_netint.c | ||
ns_parse.c | ||
ns_print.c | ||
ns_samedomain.c | ||
ns_ttl.c | ||
nsap_addr.c | ||
README | ||
res_comp.c | ||
res_data.c | ||
res_debug.c | ||
res_debug.h | ||
res_hconf.c | ||
res_hconf.h | ||
res_init.c | ||
res_libc.c | ||
res_mkquery.c | ||
res_query.c | ||
res_send.c | ||
res-state.c | ||
resolv.h | ||
tst-aton.c | ||
tst-inet_ntop.c | ||
tst-leaks2.c | ||
tst-leaks.c | ||
Versions |
The resolver in the GNU C Library ********************************* Starting with version 2.2, the resolver in the GNU C Library comes from BIND 8. Only a subset of the src/lib/resolv part of libbind is included here; basically the parts that are needed to provide the functionality present in the resolver from BIND 4.9.7 that was included in the previous release of the GNU C Library, augmented by the parts needed to provide thread-safety. This means that support for things as dynamic DNS updates and TSIG keys isn't included. If you need those facilities, please take a look at the full BIND distribution. Differences =========== The resolver in the GNU C Library still differs from what's in BIND 8.2.3-T5B: * The resolver in glibc strictly adheres to the recommendations in RFC 1535. BIND 8.2.3-T5B seems to relax those rules a bit (see the code that's wrapped in `#ifndef RFC1535'). * The RES_DEBUG option (`options debug' in /etc/resolv.conf) has been disabled. * The resolver in glibc allows underscores in domain names. * The <resolv.h> header in glibc includes <netinet/in.h> and <arpa/nameser.h> to make it self-contained. * The `res_close' function in glibc only tries to close open files referenced through `_res' if the RES_INIT bit is set in `_res.options'. This fixes a potential security bug with programs that bogusly call `res_close' without initialising the resolver state first. Note that the thread-safe `res_nclose' still doesn't check the RES_INIT bit. By the way, you're not really supposed to call `res_close/res_nclose' directly. * The resolver in glibc can connect to a nameserver over IPv6. Just specify the IPv6 address in /etc/resolv.conf. You cannot change the address of an IPv6 nameserver dynamically in your program though. Using the resolver in multi-threaded code ========================================= The traditional resolver interfaces `res_query', `res_search', `res_mkquery', `res_send' and `res_init', used a static (global) resolver state stored in the `_res' structure. Therefore, these interfaces are not thread-safe. Therefore, BIND 8.2 introduced a set of "new" interfaces `res_nquery', `res_nsearch', `res_nmkquery', `res_nsend' and `res_ninit' that take a `res_state' as their first argument, so you can use a per-thread resolver state. In glibc, when you link with -lpthread, such a per-thread resolver state is already present. It can be accessed using `_res', which has been redefined as a macro, in a similar way to what has been done for the `errno' and `h_errno' variables. This per-thread resolver state is also used for the `gethostby*' family of functions, which means that for example `gethostbyname_r' is now fully thread-safe and re-entrant. The traditional resolver interfaces however, continue to use a single resolver state and are therefore still thread-unsafe. The resolver state is the same resolver state that is used for the initial ("main") thread. This has the following consequences for existing binaries and source code: * Single-threaded programs will continue to work. There should be no user-visible changes when you recompile them. * Multi-threaded programs that use the traditional resolver interfaces in the "main" thread should continue to work, except that they no longer see any changes in the global resolver state caused by calls to, for example, `gethostbyname' in other threads. Again there should be no user-visible changes when you recompile these programs. * Multi-threaded programs that use the traditional resolver interfaces in more than one thread should be just as buggy as before (there are no problems if you use proper locking of course). If you recompile these programs, manipulating the _res structure in threads other than the "main" thread will seem to have no effect though. * In Multi-threaded that manipulate the _res structure, calls to functions like `gethostbyname' in threads other than the "main" thread won't be influenced by the those changes anymore. So if you set RES_USE_INET6, a call to `gethostbyname' won't return any IPv6 hosts anymore. If you recompile such programs, manipulating the _res structure will affect the thread in which you do so instead of the "main" thread. We recommend to use the new thread-safe interfaces in new code, since the traditional interfaces have been deprecated by the BIND folks. For compatibility with other (older) systems you might want to continue to use those interfaces though. Using the resolver in C++ code ============================== There resolver contains some hooks which will allow the user to install some callback functions that make it possible to filter DNS requests and responses. Although we do not encourage you to make use of this facility at all, C++ developers should realise that it isn't safe to throw exceptions from such callback functions. Source code =========== The following files come from the BIND distribution (currently version 8.2.3-T5B): src/include/ arpa/nameser.h arpa/nameser_compat.h resolv.h src/lib/resolv/ herror.c res_comp.c res_data.c res_debug.c res_debug.h res_init.c res_mkquery.c res_query.c res_send.c src/lib/nameser/ ns_name.c ns_netint.c ns_parse.c ns_print.c ns_samedomain.c ns_ttl.c src/lib/inet/ inet_addr.c inet_net_ntop.c inet_net_pton.c inet_neta.c inet_ntop.c inet_pton.c nsap_addr.c src/lib/isc/ base64.c Some of these files have been optimised a bit, and adaptations have been made to make them fit in with the rest of glibc. The more non-obvious changes are wrapped in something like `#ifdef _LIBC'. res_libc.c is home-brewn, although parts of it are taken from res_data.c. res_hconf.c and res_hconf.h were contributed by David Mosberger, and do not come from BIND. The files gethnamaddr.c, mapv4v6addr.h and mapv4v6hostent.h are leftovers from BIND 4.9.7.