Snap for 7487129 from 4257bd229042acc7cbf06b3740091a0385151ef7 to tm-release (4aba8040) · Commits · e / os / android_packages_modules_DnsResolver

Android.bp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -114,6 +114,10 @@ aidl_interface {

	cc_defaults {		cc_defaults {
	name: "resolv_test_defaults",		name: "resolv_test_defaults",
			cflags: [
			// networkCreatePhysical and networkCreateVpn were deprecated from netd_aidl_interface v6.
			"-Wno-error=deprecated-declarations",
			],
	// Note that, static link liblog and libbase is a hard requirement for resolv related tests		// Note that, static link liblog and libbase is a hard requirement for resolv related tests
	// because libbase is not compatible between Q and R for general platform build due		// because libbase is not compatible between Q and R for general platform build due
	// to its log revelant functions changing. And most of resolv related tests must be able to run		// to its log revelant functions changing. And most of resolv related tests must be able to run

gethnamaddr.cpp

+16 −57

Original line number	Original line	Diff line number	Diff line
	@@ -82,16 +82,6 @@

	using android::net::NetworkDnsEventReported;		using android::net::NetworkDnsEventReported;

	// NetBSD uses _DIAGASSERT to null-check arguments and the like,
	// but it's clear from the number of mistakes in their assertions
	// that they don't actually test or ship with this.
	#define _DIAGASSERT(e) /* nothing */

	// TODO: unify macro ALIGNBYTES and ALIGN for all possible data type alignment of hostent
	// buffer.
	#define ALIGNBYTES (sizeof(uintptr_t) - 1)
	#define ALIGN(p) (((uintptr_t)(p) + ALIGNBYTES) & ~ALIGNBYTES)

	constexpr int MAXADDRS = 35;		constexpr int MAXADDRS = 35;

	typedef union {		typedef union {
	@@ -99,16 +89,7 @@ typedef union {
	uint8_t buf[MAXPACKET];		uint8_t buf[MAXPACKET];
	} querybuf;		} querybuf;

	typedef union {
	int32_t al;
	char ac;
	} align;

	static void convert_v4v6_hostent(struct hostent* hp, char** bpp, char* ep,
	const std::function<void(struct hostent* hp)>& mapping_param,
	const std::function<void(char* src, char* dst)>& mapping_addr);
	static void pad_v4v6_hostent(struct hostent* hp, char** bpp, char* ep);		static void pad_v4v6_hostent(struct hostent* hp, char** bpp, char* ep);

	static int dns_gethtbyaddr(const unsigned char* uaddr, int len, int af,		static int dns_gethtbyaddr(const unsigned char* uaddr, int len, int af,
	const android_net_context* netcontext, getnamaddr* info,		const android_net_context* netcontext, getnamaddr* info,
	NetworkDnsEventReported* event);		NetworkDnsEventReported* event);
	@@ -125,8 +106,9 @@ static int dns_gethtbyname(ResState* res, const char* name, int af, getnamaddr*
	if (eom - (ptr) < (count)) goto no_recovery; \		if (eom - (ptr) < (count)) goto no_recovery; \
	} while (0)		} while (0)

	static struct hostent* getanswer(const querybuf* answer, int anslen, const char* qname, int qtype,		static struct hostent* getanswer(const querybuf* _Nonnull answer, int anslen,
	struct hostent* hent, char* buf, size_t buflen, int* he) {		const char* _Nonnull qname, int qtype, struct hostent* hent,
			char* buf, size_t buflen, int* he) {
	const HEADER* hp;		const HEADER* hp;
	const uint8_t* cp;		const uint8_t* cp;
	int n;		int n;
	@@ -141,9 +123,6 @@ static struct hostent* getanswer(const querybuf* answer, int anslen, const char*
	const char* tname;		const char* tname;
	std::vector<char*> aliases;		std::vector<char*> aliases;

	_DIAGASSERT(answer != NULL);
	_DIAGASSERT(qname != NULL);

	tname = qname;		tname = qname;
	hent->h_name = NULL;		hent->h_name = NULL;
	eom = answer->buf + anslen;		eom = answer->buf + anslen;
	@@ -324,7 +303,7 @@ static struct hostent* getanswer(const querybuf* answer, int anslen, const char*
	bp += nn;		bp += nn;
	}		}

	bp += sizeof(align) - (size_t)((uintptr_t)bp % sizeof(align));		bp = align_ptr<sizeof(int32_t)>(bp);

	if (bp + n >= ep) {		if (bp + n >= ep) {
	LOG(DEBUG) << __func__ << ": size (" << n << ") too big";		LOG(DEBUG) << __func__ << ": size (" << n << ") too big";
	@@ -364,7 +343,7 @@ no_recovery:
	*he = NO_RECOVERY;		*he = NO_RECOVERY;
	return NULL;		return NULL;
	success:		success:
	bp = (char*) ALIGN(bp);		bp = align_ptr(bp);
	aliases.push_back(nullptr);		aliases.push_back(nullptr);
	qlen = aliases.size() * sizeof(*hent->h_aliases);		qlen = aliases.size() * sizeof(*hent->h_aliases);
	if ((size_t)(ep - bp) < qlen) goto nospc;		if ((size_t)(ep - bp) < qlen) goto nospc;
	@@ -474,15 +453,13 @@ fake:
	return 0;		return 0;
	}		}

	int resolv_gethostbyaddr(const void* addr, socklen_t len, int af, hostent* hp, char* buf,		int resolv_gethostbyaddr(const void* _Nonnull addr, socklen_t len, int af, hostent* hp, char* buf,
	size_t buflen, const struct android_net_context* netcontext,		size_t buflen, const struct android_net_context* netcontext,
	hostent** result, NetworkDnsEventReported* event) {		hostent** result, NetworkDnsEventReported* event) {
	const uint8_t* uaddr = (const uint8_t*)addr;		const uint8_t* uaddr = (const uint8_t*)addr;
	socklen_t size;		socklen_t size;
	struct getnamaddr info;		struct getnamaddr info;

	_DIAGASSERT(addr != NULL);

	if (af == AF_INET6 && len == NS_IN6ADDRSZ &&		if (af == AF_INET6 && len == NS_IN6ADDRSZ &&
	(IN6_IS_ADDR_LINKLOCAL((const struct in6_addr*) addr) \|\|		(IN6_IS_ADDR_LINKLOCAL((const struct in6_addr*) addr) \|\|
	IN6_IS_ADDR_SITELOCAL((const struct in6_addr*) addr))) {		IN6_IS_ADDR_SITELOCAL((const struct in6_addr*) addr))) {
	@@ -614,42 +591,24 @@ nospc:
	return NULL;		return NULL;
	}		}

	static void convert_v4v6_hostent(struct hostent* hp, char** bpp, char* ep,		/* Reserve space for mapping IPv4 address to IPv6 address in place */
	const std::function<void(struct hostent* hp)>& map_param,		static void pad_v4v6_hostent(struct hostent* _Nonnull hp, char** _Nonnull bpp, char* _Nonnull ep) {
	const std::function<void(char* src, char* dst)>& map_addr) {
	_DIAGASSERT(hp != NULL);
	_DIAGASSERT(bpp != NULL);
	_DIAGASSERT(ep != NULL);

	if (hp->h_addrtype != AF_INET \|\| hp->h_length != NS_INADDRSZ) return;		if (hp->h_addrtype != AF_INET \|\| hp->h_length != NS_INADDRSZ) return;
	map_param(hp);
	for (char** ap = hp->h_addr_list; *ap; ap++) {		for (char** ap = hp->h_addr_list; *ap; ap++) {
	int i = (int)(sizeof(align) - (size_t)((uintptr_t)*bpp % sizeof(align)));		char* const bp = align_ptr<sizeof(int32_t)>(*bpp);

	if (ep - *bpp < (i + NS_IN6ADDRSZ)) {		if (ep - bp < NS_IN6ADDRSZ) {
	/* Out of memory. Truncate address list here. XXX */		// Out of space. Truncate address list here.
	*ap = NULL;		*ap = nullptr;
	return;		return;
	}		}
	*bpp += i;		memcpy(bp, *ap, NS_INADDRSZ);
	map_addr(ap, bpp);		memcpy(bp + NS_INADDRSZ, NAT64_PAD, sizeof(NAT64_PAD));
	ap = bpp;		*ap = bp;
	*bpp += NS_IN6ADDRSZ;		*bpp = bp + NS_IN6ADDRSZ;
	}		}
	}		}

	/* Reserve space for mapping IPv4 address to IPv6 address in place */
	static void pad_v4v6_hostent(struct hostent* hp, char** bpp, char* ep) {
	convert_v4v6_hostent(hp, bpp, ep,
	[](struct hostent* hp) {
	(void) hp; /* unused */
	},
	[](char* src, char* dst) {
	memcpy(dst, src, NS_INADDRSZ);
	memcpy(dst + NS_INADDRSZ, NAT64_PAD, sizeof(NAT64_PAD));
	});
	}

	static int dns_gethtbyname(ResState* res, const char* name, int addr_type, getnamaddr* info) {		static int dns_gethtbyname(ResState* res, const char* name, int addr_type, getnamaddr* info) {
	int n, type;		int n, type;
	info->hp->h_addrtype = addr_type;		info->hp->h_addrtype = addr_type;

resolv_private.h

+27 −0

Original line number	Original line	Diff line number	Diff line
	@@ -194,6 +194,33 @@ Dest saturate_cast(int64_t x) {
	return static_cast<Dest>(x);		return static_cast<Dest>(x);
	}		}

			constexpr bool is_power_of_2(size_t n) {
			return n != 0 && (n & (n - 1)) == 0;
			}

			// Rounds up a pointer to a char buffer \|p\| to a multiple of \|Alignment\| bytes.
			// Requirements:
			// \|p\| must be a pointer to a byte-sized type (e.g.: uint8_t)
			// \|Alignment\| must be a power of 2
			template<uintptr_t Alignment = sizeof(void*), typename T>
			requires (sizeof(T) == 1) && (is_power_of_2(Alignment))
			constexpr T* align_ptr(T* const p) {
			// Written this way to sidestep the performance-no-int-to-ptr clang-tidy warning.
			constexpr uintptr_t mask = Alignment - 1;
			const uintptr_t uintptr = reinterpret_cast<uintptr_t>(p);
			const uintptr_t aligned = (uintptr + mask) & ~mask;
			const uintptr_t bias = aligned - uintptr;
			return p + bias;
			}

			// Testcases for align_ptr()
			// TODO: enable when libc++ has std::bit_cast - reinterpret_cast isn't allowed in consteval context
			// static_assert(align_ptr((char)1000) == (char)1000);
			// static_assert(align_ptr((char)1001) == (char)1000 + sizeof(void*));
			// static_assert(align_ptr((char)1003) == (char)1000 + sizeof(void*));
			// static_assert(align_ptr<sizeof(uint32_t)>((char)1004) == (char)1004);
			// static_assert(align_ptr<sizeof(uint64_t)>((char)1004) == (char)1008);

	android::net::NsType getQueryType(const uint8_t* msg, size_t msgLen);		android::net::NsType getQueryType(const uint8_t* msg, size_t msgLen);

	android::net::IpVersion ipFamilyToIPVersion(int ipFamily);		android::net::IpVersion ipFamilyToIPVersion(int ipFamily);

sethostent.cpp

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -46,9 +46,6 @@
	constexpr int MAXALIASES = 35;		constexpr int MAXALIASES = 35;
	constexpr int MAXADDRS = 35;		constexpr int MAXADDRS = 35;

	#define ALIGNBYTES (sizeof(uintptr_t) - 1)
	#define ALIGN(p) (((uintptr_t)(p) + ALIGNBYTES) & ~ALIGNBYTES)

	static void sethostent_r(FILE** hf) {		static void sethostent_r(FILE** hf) {
	if (!*hf)		if (!*hf)
	*hf = fopen(_PATH_HOSTS, "re");		*hf = fopen(_PATH_HOSTS, "re");
	@@ -121,7 +118,7 @@ int _hf_gethtbyname2(const char* name, int af, getnamaddr* info) {
	if (anum >= MAXALIASES) goto nospc;		if (anum >= MAXALIASES) goto nospc;
	HENT_SCOPY(aliases[anum], hp->h_aliases[anum], ptr, len);		HENT_SCOPY(aliases[anum], hp->h_aliases[anum], ptr, len);
	}		}
	ptr = (char*) ALIGN(ptr);		ptr = align_ptr(ptr);
	if ((size_t)(ptr - buf) >= info->buflen) goto nospc;		if ((size_t)(ptr - buf) >= info->buflen) goto nospc;
	}		}