Gitiles
Code Review Sign In
review.blissroms.org / platform_packages_modules_DnsResolver / bc7d6c0a2030ec19db7f7a8b98e8ee0c65c7ecb5
commitbc7d6c0a2030ec19db7f7a8b98e8ee0c65c7ecb5[log] [tgz]
authorBernie Innocenti <codewiz@google.com>Tue Jun 22 16:59:52 2021 +0900
committerBernie Innocenti <codewiz@google.com>Wed Jun 23 04:58:34 2021 +0000
tree57d543555e131d2e1bb0cd4fcd3e82ffccd6858f
parent0bff241f710c08b847c80987973b954fc33532dd [diff]
Sanitize buffer alignment macros

The ancient ALIGN() macros caused clang-tidy to complain:

packages/modules/DnsResolver/gethnamaddr.cpp:367:10: error: integer to
pointer cast pessimizes optimization opportunities
[performance-no-int-to-ptr,-warnings-as-errors]
    bp = (char*) ALIGN(bp);

The new inline template align_ptr() sidesteps this issue as recommended
by the clang-tidy documentation:
  https://clang.llvm.org/extra/clang-tidy/checks/performance-no-int-to-ptr.html

Furthermore, align_ptr() is used to replace this... surprising
piece of code:

    bp += sizeof(align) - (size_t)((uintptr_t)bp % sizeof(align));

See the bug there? When bp is already aligned to a multiple of
sizeof(align), it will overalign! Also, 'align' was a union of a
uint32_t and a char, which is obviously the same alignment of a plain
uint32_t on any architecture ever created!

Bug: 182416023
Change-Id: Id39c3030025e4510feeb55723760a2950067cece
3 files changed
tree: 57d543555e131d2e1bb0cd4fcd3e82ffccd6858f
  1. aidl_api/
  2. apex/
  3. binder/
  4. include/
  5. tests/
  6. .clang-format ⇨ ../../../build/soong/scripts/system-clang-format
  7. rustfmt.toml ⇨ ../../../build/soong/scripts/rustfmt.toml
  8. .editorconfig
  9. Android.bp
  10. cbindgen.toml
  11. Dns64Configuration.cpp
  12. Dns64Configuration.h
  13. DnsProxyListener.cpp
  14. DnsProxyListener.h
  15. DnsQueryLog.cpp
  16. DnsQueryLog.h
  17. DnsQueryLogTest.cpp
  18. DnsResolver.cpp
  19. DnsResolver.h
  20. DnsResolverService.cpp
  21. DnsResolverService.h
  22. DnsStats.cpp
  23. DnsStats.h
  24. DnsStatsTest.cpp
  25. DnsTlsDispatcher.cpp
  26. DnsTlsDispatcher.h
  27. DnsTlsQueryMap.cpp
  28. DnsTlsQueryMap.h
  29. DnsTlsServer.cpp
  30. DnsTlsServer.h
  31. DnsTlsSessionCache.cpp
  32. DnsTlsSessionCache.h
  33. DnsTlsSocket.cpp
  34. DnsTlsSocket.h
  35. DnsTlsSocketFactory.h
  36. DnsTlsTransport.cpp
  37. DnsTlsTransport.h
  38. doh.h
  39. doh.rs
  40. Experiments.cpp
  41. Experiments.h
  42. ExperimentsTest.cpp
  43. getaddrinfo.cpp
  44. getaddrinfo.h
  45. gethnamaddr.cpp
  46. gethnamaddr.h
  47. hostent.h
  48. IDnsTlsSocket.h
  49. IDnsTlsSocketFactory.h
  50. IDnsTlsSocketObserver.h
  51. IPrivateDnsServer.h
  52. libnetd_resolv.map.txt
  53. LockedQueue.h
  54. NOTICE
  55. OperationLimiter.h
  56. OperationLimiterTest.cpp
  57. OWNERS
  58. params.h
  59. PREUPLOAD.cfg
  60. PrivateDnsCommon.h
  61. PrivateDnsConfiguration.cpp
  62. PrivateDnsConfiguration.h
  63. PrivateDnsConfigurationTest.cpp
  64. PrivateDnsValidationObserver.h
  65. README-DoT.md
  66. README.md
  67. res_cache.cpp
  68. res_comp.cpp
  69. res_comp.h
  70. res_debug.cpp
  71. res_debug.h
  72. res_mkquery.cpp
  73. res_query.cpp
  74. res_send.cpp
  75. res_send.h
  76. res_stats.cpp
  77. resolv_cache.h
  78. resolv_private.h
  79. resolv_rust_test_config_template.xml
  80. resolv_test_config_template.xml
  81. ResolverController.cpp
  82. ResolverController.h
  83. ResolverEventReporter.cpp
  84. ResolverEventReporter.h
  85. ResolverStats.h
  86. sethostent.cpp
  87. stats.h
  88. stats.proto
  89. TEST_MAPPING
  90. util.cpp
  91. util.h
README.md

Logging

This code uses LOG(X) for logging. Log levels are VERBOSE,DEBUG,INFO,WARNING and ERROR. The default setting is WARNING and logs relate to WARNING and ERROR will be shown. If you want to enable the DEBUG level logs, using following command. adb shell service call dnsresolver 10 i32 1 VERBOSE 0 DEBUG 1 INFO 2 WARNING 3 ERROR 4 Verbose resolver logs could contain PII -- do NOT enable in production builds.