1110529 - Recursive chaining in wrapped Android DNS resolver

Status: RESOLVED FIXED

(Core :: Networking: DNS, defect)

Description

[Eugen Sawin [:esawin]]

Bug 694325 introduced custom versions of getaddrinfo and related functions for pre-Honeycomb Android versions. For Android 3 and later versions however, the call to the system version of getaddrinfo (and related functions) is being incorrectly resolved to a recursive call to the wrapped custom implementation.

Comment 1

[Eugen Sawin [:esawin]]

Attachment: wrap-dns-resolver-fix

This patch calls the system function instead of the wrapped versions.
This patch is based on Firefox <=35 or 36 with the patch from bug 1109940 applied.

Comment 2

[Steve Workman [:sworkman] (INACTIVE)]

Comment on attachment 8535306 [details] [diff] [review]
wrap-dns-resolver-fix

Review of attachment 8535306 [details] [diff] [review]:
-----------------------------------------------------------------

Looks good to me. Had to read up on the __real prefix - from what I've read, this all looks sane.

Comment 3

[Mike Hommey [:glandium]]

Comment on attachment 8535306 [details] [diff] [review]
wrap-dns-resolver-fix

Review of attachment 8535306 [details] [diff] [review]:
-----------------------------------------------------------------

::: other-licenses/android/getaddrinfo.c
@@ +433,5 @@
>  const char *
>  __wrap_gai_strerror(int ecode)
>  {
>  	if (honeycomb_or_later())
> +		return __real_gai_strerror(ecode);

Note, you may want to add declarations for those functions. GCC is probably going to warn about those functions being implicitly defined.

Comment 4

[Eugen Sawin [:esawin]]

Attachment: wrap-dns-resolver-fix

Added function declarations.

Comment 5

[Eugen Sawin [:esawin]]

https://treeherder.mozilla.org/ui/#/jobs?repo=try&revision=8968f64cbd17

https://hg.mozilla.org/integration/fx-team/rev/d9fd6f35c45d

Comment 6

[Eugen Sawin [:esawin]]

Landed in bug 1109940 (https://bugzilla.mozilla.org/show_bug.cgi?id=1109940#c6).

Comment 7

[Eugen Sawin [:esawin]]

Comment on attachment 8537176 [details] [diff] [review]
wrap-dns-resolver-fix

If approved, it should land after bug 1109940.

Approval Request Comment
[Feature/regressing bug #]: bug 694325
[User impact if declined]: blocks bug 991923, major connectivity issues when switching networks or using VPNs
[Describe test coverage new/current, TBPL]: has been on nightly for some days
[Risks and why]: none, changed code path is not executed before patch from bug 991923 has landed
[String/UUID change made/needed]: none

honeycomb_or_later

Comment 8

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/314f2b8b572b