Google Git
Sign in
android / platform / packages / modules / adb / 181e45ccaed05db0d9bfe278a45418bc844a2cac
commit181e45ccaed05db0d9bfe278a45418bc844a2cac[log] [tgz]
authorMayank Rana <mrana@quicinc.com>Fri Sep 11 11:40:00 2020 -0700
committerJosh Gao <jmgao@google.com>Fri Sep 18 12:28:16 2020 -0700
tree87293d4f0284ab6a8d5ad760890167cb8aba18d4
parentb5b3fd4dd94c147191f4692fd6322bda8b550848 [diff]
adbd: Fix check against valid payload size

block->payload and its size are not valid when it is used to check
against bytes_left due to std::move() performed on its just prior
to the check. Hence check will always fail to detect the case where
received data is more than expected. To detect this condition and
allow error handling with std::move(), remove extra payload variable
and directly use block->payload.

Bug: http://b/168917244
Change-Id: I992bbba9d9a9861a195834f69d62e69b90658210
(cherry picked from commit 1cc42d32ce2f68b3aa3d7b6cc70ac2cd9c810b8b)
1 file changed
tree: 87293d4f0284ab6a8d5ad760890167cb8aba18d4
  1. apex/
  2. client/
  3. crypto/
  4. daemon/
  5. fastdeploy/
  6. fdevent/
  7. libs/
  8. pairing_auth/
  9. pairing_connection/
  10. proto/
  11. sysdeps/
  12. tls/
  13. tools/
  14. .clang-format ⇨ ../.clang-format-4
  15. adb.bash
  16. adb.cpp
  17. adb.h
  18. adb_auth.h
  19. adb_integration_test_adb.xml
  20. adb_integration_test_device.xml
  21. adb_io.cpp
  22. adb_io.h
  23. adb_io_test.cpp
  24. adb_listeners.cpp
  25. adb_listeners.h
  26. adb_listeners_test.cpp
  27. adb_mdns.h
  28. adb_test.xml
  29. adb_trace.cpp
  30. adb_trace.h
  31. adb_unique_fd.cpp
  32. adb_unique_fd.h
  33. adb_utils.cpp
  34. adb_utils.h
  35. adb_utils_test.cpp
  36. adb_wifi.h
  37. Android.bp
  38. benchmark_device.py
  39. brotli_utils.h
  40. bugreport_test.cpp
  41. file_sync_protocol.h
  42. mdns_test.cpp
  43. MODULE_LICENSE_APACHE2
  44. NOTICE
  45. OVERVIEW.TXT
  46. OWNERS
  47. protocol.txt
  48. security_log_tags.h
  49. services.cpp
  50. services.h
  51. SERVICES.TXT
  52. shell_protocol.h
  53. shell_service_protocol.cpp
  54. shell_service_protocol_test.cpp
  55. SOCKET-ACTIVATION.txt
  56. socket.h
  57. socket_spec.cpp
  58. socket_spec.h
  59. socket_spec_test.cpp
  60. socket_test.cpp
  61. sockets.cpp
  62. sockets.dia
  63. SYNC.TXT
  64. sysdeps.h
  65. sysdeps_test.cpp
  66. sysdeps_unix.cpp
  67. sysdeps_win32.cpp
  68. sysdeps_win32_test.cpp
  69. test_adb.py
  70. test_device.py
  71. trace.sh
  72. transport.cpp
  73. transport.h
  74. transport_benchmark.cpp
  75. transport_fd.cpp
  76. transport_local.cpp
  77. transport_test.cpp
  78. types.cpp
  79. types.h
  80. types_test.cpp