The branch master has been updated via 91cb81d40a8102c3d8667629661be8d6937db82b (commit) via 7f616a00e9232392927099dca1eca70d0d058665 (commit) from 23ccf13dd68e75ba6cabbcaaeaff21d22aacb7d0 (commit)
- Log ----------------------------------------------------------------- commit 91cb81d40a8102c3d8667629661be8d6937db82b Author: Tomas Mraz <tm...@fedoraproject.org> Date: Mon Aug 12 16:43:59 2019 +0200 BIO_lookup_ex: Do not retry on EAI_MEMORY We should not retry on EAI_MEMORY as that error is most probably fatal and not depending on AI_ADDRCONFIG hint. Also report the error from the first call if the second call fails as that one would be most probably the more interesting one. Reviewed-by: Paul Dale <paul.d...@oracle.com> Reviewed-by: Richard Levitte <levi...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9535) commit 7f616a00e9232392927099dca1eca70d0d058665 Author: Tomas Mraz <tm...@fedoraproject.org> Date: Mon Aug 5 19:11:07 2019 +0200 BIO_lookup_ex: Always retry the lookup on failure with AI_NUMERICHOST set Do not try to discern the error return value on getaddrinfo() failure but when retrying set the AI_NUMERICHOST to avoid DNS lookups. Fixes: #9053 Reviewed-by: Paul Dale <paul.d...@oracle.com> Reviewed-by: Richard Levitte <levi...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9535) ----------------------------------------------------------------------- Summary of changes: crypto/bio/b_addr.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/crypto/bio/b_addr.c b/crypto/bio/b_addr.c index 47366332ac..ae82f098a9 100644 --- a/crypto/bio/b_addr.c +++ b/crypto/bio/b_addr.c @@ -676,7 +676,7 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type, if (1) { #ifdef AI_PASSIVE - int gai_ret = 0; + int gai_ret = 0, old_ret = 0; struct addrinfo hints; memset(&hints, 0, sizeof(hints)); @@ -684,12 +684,12 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type, hints.ai_family = family; hints.ai_socktype = socktype; hints.ai_protocol = protocol; -#ifdef AI_ADDRCONFIG -#ifdef AF_UNSPEC +# ifdef AI_ADDRCONFIG +# ifdef AF_UNSPEC if (family == AF_UNSPEC) -#endif +# endif hints.ai_flags |= AI_ADDRCONFIG; -#endif +# endif if (lookup_type == BIO_LOOKUP_SERVER) hints.ai_flags |= AI_PASSIVE; @@ -705,26 +705,26 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type, "calling getaddrinfo()"); BIOerr(BIO_F_BIO_LOOKUP_EX, ERR_R_SYS_LIB); break; +# endif +# ifdef EAI_MEMORY + case EAI_MEMORY: + BIOerr(BIO_F_BIO_LOOKUP_EX, ERR_R_MALLOC_FAILURE); + break; # endif case 0: ret = 1; /* Success */ break; -# if (defined(EAI_FAMILY) || defined(EAI_ADDRFAMILY)) && defined(AI_ADDRCONFIG) -# ifdef EAI_FAMILY - case EAI_FAMILY: -# endif -# ifdef EAI_ADDRFAMILY - case EAI_ADDRFAMILY: -# endif + default: +# if defined(AI_ADDRCONFIG) && defined(AI_NUMERICHOST) if (hints.ai_flags & AI_ADDRCONFIG) { hints.ai_flags &= ~AI_ADDRCONFIG; + hints.ai_flags |= AI_NUMERICHOST; + old_ret = gai_ret; goto retry; } # endif - /* fall through */ - default: BIOerr(BIO_F_BIO_LOOKUP_EX, ERR_R_SYS_LIB); - ERR_add_error_data(1, gai_strerror(gai_ret)); + ERR_add_error_data(1, gai_strerror(old_ret ? old_ret : gai_ret)); break; } } else {