Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_packages_modules_adb / 1cc42d32ce2f68b3aa3d7b6cc70ac2cd9c810b8b
commit1cc42d32ce2f68b3aa3d7b6cc70ac2cd9c810b8b[log] [tgz]
authorMayank Rana <mrana@quicinc.com>Fri Sep 11 11:40:00 2020 -0700
committerJosh Gao <jmgao@google.com>Fri Sep 18 19:26:45 2020 +0000
treed7aafa697f8ca44a44bad14d20f41d7209ea358c
parenta501ccb518028ae21926b8f11ea8a81b5163456f [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
1 file changed
tree: d7aafa697f8ca44a44bad14d20f41d7209ea358c
  1. apex/
  2. client/
  3. coverage/
  4. crypto/
  5. daemon/
  6. fastdeploy/
  7. fdevent/
  8. libs/
  9. pairing_auth/
  10. pairing_connection/
  11. proto/
  12. sysdeps/
  13. tls/
  14. tools/
  15. .clang-format ⇨ ../.clang-format-4
  16. adb.bash
  17. adb.cpp
  18. adb.h
  19. adb_auth.h
  20. adb_integration_test_adb.xml
  21. adb_integration_test_device.xml
  22. adb_io.cpp
  23. adb_io.h
  24. adb_io_test.cpp
  25. adb_listeners.cpp
  26. adb_listeners.h
  27. adb_listeners_test.cpp
  28. adb_mdns.h
  29. adb_test.xml
  30. adb_trace.cpp
  31. adb_trace.h
  32. adb_unique_fd.cpp
  33. adb_unique_fd.h
  34. adb_utils.cpp
  35. adb_utils.h
  36. adb_utils_test.cpp
  37. adb_wifi.h
  38. Android.bp
  39. benchmark_device.py
  40. bugreport_test.cpp
  41. compression_utils.h
  42. file_sync_protocol.h
  43. mdns_test.cpp
  44. MODULE_LICENSE_APACHE2
  45. NOTICE
  46. OVERVIEW.TXT
  47. OWNERS
  48. protocol.txt
  49. security_log_tags.h
  50. services.cpp
  51. services.h
  52. SERVICES.TXT
  53. shell_protocol.h
  54. shell_service_protocol.cpp
  55. shell_service_protocol_test.cpp
  56. SOCKET-ACTIVATION.txt
  57. socket.h
  58. socket_spec.cpp
  59. socket_spec.h
  60. socket_spec_test.cpp
  61. socket_test.cpp
  62. sockets.cpp
  63. sockets.dia
  64. SYNC.TXT
  65. sysdeps.h
  66. sysdeps_test.cpp
  67. sysdeps_unix.cpp
  68. sysdeps_win32.cpp
  69. sysdeps_win32_test.cpp
  70. test_adb.py
  71. test_device.py
  72. trace.sh
  73. transport.cpp
  74. transport.h
  75. transport_benchmark.cpp
  76. transport_fd.cpp
  77. transport_test.cpp
  78. types.cpp
  79. types.h
  80. types_test.cpp