security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

dirmngr: Fix alignment of ADDR. 

* dirmngr/dns-stuff.h (dns_addrinfo_s): Use struct sockaddr_storage
for size and alignment.
* dirmngr/dns-stuff.c (resolve_name_libdns): Follow the change.
(resolve_dns_name): Use struct sockaddr_storage.
(resolve_addr_standard, resolve_dns_addr): Likewise.
(resolve_dns_addr): Likewise.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2017-04-13 14:33:33 +09:00
parent 37018adce6
commit 892b33bb2c
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dirmngr/dns-stuff.c
View File

@ -844,7 +844,7 @@ resolve_name_libdns (const char *name, unsigned short port,
(*r_canonname)[strlen (*r_canonname)-1] = 0; (*r_canonname)[strlen (*r_canonname)-1] = 0;
} }
dai = xtrymalloc (sizeof *dai + ent->ai_addrlen -1); dai = xtrymalloc (sizeof *dai);
if (dai == NULL) if (dai == NULL)
{ {
err = gpg_error_from_syserror (); err = gpg_error_from_syserror ();
@ -968,7 +968,7 @@ resolve_name_standard (const char *name, unsigned short port,
if (opt_disable_ipv6 && ai->ai_family == AF_INET6) if (opt_disable_ipv6 && ai->ai_family == AF_INET6)
continue; continue;
dai = xtrymalloc (sizeof *dai + ai->ai_addrlen - 1); dai = xtrymalloc (sizeof *dai);
dai->family = ai->ai_family; dai->family = ai->ai_family;
dai->socktype = ai->ai_socktype; dai->socktype = ai->ai_socktype;
dai->protocol = ai->ai_protocol; dai->protocol = ai->ai_protocol;
@ -1036,7 +1036,7 @@ resolve_dns_name (const char *name, unsigned short port,
#ifdef USE_LIBDNS #ifdef USE_LIBDNS
/* Resolve an address using libdns. */ /* Resolve an address using libdns. */
static gpg_error_t static gpg_error_t
resolve_addr_libdns (const struct sockaddr *addr, int addrlen, resolve_addr_libdns (const struct sockaddr_storage *addr, int addrlen,
unsigned int flags, char **r_name) unsigned int flags, char **r_name)
{ {
gpg_error_t err; gpg_error_t err;
@ -1050,13 +1050,13 @@ resolve_addr_libdns (const struct sockaddr *addr, int addrlen,
/* First we turn ADDR into a DNS name (with ".arpa" suffix). */ /* First we turn ADDR into a DNS name (with ".arpa" suffix). */
err = 0; err = 0;
if (addr->sa_family == AF_INET6) if (addr->ss_family == AF_INET6)
{ {
const struct sockaddr_in6 *a6 = (const struct sockaddr_in6 *)addr; const struct sockaddr_in6 *a6 = (const struct sockaddr_in6 *)addr;
if (!dns_aaaa_arpa (host, sizeof host, (void*)&a6->sin6_addr)) if (!dns_aaaa_arpa (host, sizeof host, (void*)&a6->sin6_addr))
err = gpg_error (GPG_ERR_INV_OBJ); err = gpg_error (GPG_ERR_INV_OBJ);
} }
else if (addr->sa_family == AF_INET) else if (addr->ss_family == AF_INET)
{ {
const struct sockaddr_in *a4 = (const struct sockaddr_in *)addr; const struct sockaddr_in *a4 = (const struct sockaddr_in *)addr;
if (!dns_a_arpa (host, sizeof host, (void*)&a4->sin_addr)) if (!dns_a_arpa (host, sizeof host, (void*)&a4->sin_addr))
@ -1144,18 +1144,19 @@ resolve_addr_libdns (const struct sockaddr *addr, int addrlen,
buflen = sizeof ptr.host; buflen = sizeof ptr.host;
p = buffer; p = buffer;
if (addr->sa_family == AF_INET6 && (flags & DNS_WITHBRACKET)) if (addr->ss_family == AF_INET6 && (flags & DNS_WITHBRACKET))
{ {
*p++ = '['; *p++ = '[';
buflen -= 2; buflen -= 2;
} }
ec = getnameinfo (addr, addrlen, p, buflen, NULL, 0, NI_NUMERICHOST); ec = getnameinfo ((const struct sockaddr *)addr,
addrlen, p, buflen, NULL, 0, NI_NUMERICHOST);
if (ec) if (ec)
{ {
err = map_eai_to_gpg_error (ec); err = map_eai_to_gpg_error (ec);
goto leave; goto leave;
} }
if (addr->sa_family == AF_INET6 && (flags & DNS_WITHBRACKET)) if (addr->ss_family == AF_INET6 && (flags & DNS_WITHBRACKET))
strcat (buffer, "]"); strcat (buffer, "]");
} }
@ -1169,7 +1170,7 @@ resolve_addr_libdns (const struct sockaddr *addr, int addrlen,
/* Resolve an address using the standard system function. */ /* Resolve an address using the standard system function. */
static gpg_error_t static gpg_error_t
resolve_addr_standard (const struct sockaddr *addr, int addrlen, resolve_addr_standard (const struct sockaddr_storage *addr, int addrlen,
unsigned int flags, char **r_name) unsigned int flags, char **r_name)
{ {
gpg_error_t err; gpg_error_t err;
@ -1187,20 +1188,22 @@ resolve_addr_standard (const struct sockaddr *addr, int addrlen,
if ((flags & DNS_NUMERICHOST) || tor_mode) if ((flags & DNS_NUMERICHOST) || tor_mode)
ec = EAI_NONAME; ec = EAI_NONAME;
else else
ec = getnameinfo (addr, addrlen, buffer, buflen, NULL, 0, NI_NAMEREQD); ec = getnameinfo ((const struct sockaddr *)addr,
addrlen, buffer, buflen, NULL, 0, NI_NAMEREQD);
if (!ec && *buffer == '[') if (!ec && *buffer == '[')
ec = EAI_FAIL; /* A name may never start with a bracket. */ ec = EAI_FAIL; /* A name may never start with a bracket. */
else if (ec == EAI_NONAME) else if (ec == EAI_NONAME)
{ {
p = buffer; p = buffer;
if (addr->sa_family == AF_INET6 && (flags & DNS_WITHBRACKET)) if (addr->ss_family == AF_INET6 && (flags & DNS_WITHBRACKET))
{ {
*p++ = '['; *p++ = '[';
buflen -= 2; buflen -= 2;
} }
ec = getnameinfo (addr, addrlen, p, buflen, NULL, 0, NI_NUMERICHOST); ec = getnameinfo ((const struct sockaddr *)addr,
if (!ec && addr->sa_family == AF_INET6 && (flags & DNS_WITHBRACKET)) addrlen, p, buflen, NULL, 0, NI_NUMERICHOST);
if (!ec && addr->ss_family == AF_INET6 && (flags & DNS_WITHBRACKET))
strcat (buffer, "]"); strcat (buffer, "]");
} }
@ -1229,7 +1232,7 @@ resolve_addr_standard (const struct sockaddr *addr, int addrlen,
/* A wrapper around getnameinfo. */ /* A wrapper around getnameinfo. */
gpg_error_t gpg_error_t
resolve_dns_addr (const struct sockaddr *addr, int addrlen, resolve_dns_addr (const struct sockaddr_storage *addr, int addrlen,
unsigned int flags, char **r_name) unsigned int flags, char **r_name)
{ {
gpg_error_t err; gpg_error_t err;

4
dirmngr/dns-stuff.h
View File

@ -78,7 +78,7 @@ struct dns_addrinfo_s
int socktype; int socktype;
int protocol; int protocol;
int addrlen; int addrlen;
struct sockaddr addr[1]; struct sockaddr_storage addr[1];
}; };
@ -142,7 +142,7 @@ gpg_error_t resolve_dns_name (const char *name, unsigned short port,
dns_addrinfo_t *r_dai, char **r_canonname); dns_addrinfo_t *r_dai, char **r_canonname);
/* Function similar to getnameinfo. */ /* Function similar to getnameinfo. */
gpg_error_t resolve_dns_addr (const struct sockaddr *addr, int addrlen, gpg_error_t resolve_dns_addr (const struct sockaddr_storage *addr, int addrlen,
unsigned int flags, char **r_name); unsigned int flags, char **r_name);
/* Return true if NAME is a numerical IP address. */ /* Return true if NAME is a numerical IP address. */