RESTRICT AUTOMERGE Disallow unexpected incoming HID connections
HID profile accepted any new incoming HID connection. Even when the connection policy disabled HID connection, remote devices could initiate HID connection. This change ensures that incoming HID connection are accepted only if application was interested in that HID connection. This vulnerarbility no longer exists on the main because of feature request b/324093729. Test: mmm packages/modules/Bluetooth Test: Manual | Pair and connect a HID device, disable HID connection from Bluetooth device setting, attempt to connect from the HID device. Bug: 308429049 Ignore-AOSP-First: security (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bdd92020a9c14c3f541b39624c5b1e0af599acc5) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:358b66af175f423523c5d90bb8aea4b3eb084172) Merged-In: Iba2ac3502bf1e6e4ac1f60ed64b1b074facd880b Change-Id: Iba2ac3502bf1e6e4ac1f60ed64b1b074facd880b
Showing
- android/app/jni/com_android_bluetooth_hid_host.cpp 5 additions, 3 deletionsandroid/app/jni/com_android_bluetooth_hid_host.cpp
- android/app/src/com/android/bluetooth/hid/HidHostService.java 6 additions, 5 deletions...oid/app/src/com/android/bluetooth/hid/HidHostService.java
- system/btif/include/btif_hh.h 3 additions, 1 deletionsystem/btif/include/btif_hh.h
- system/btif/include/btif_storage.h 23 additions, 0 deletionssystem/btif/include/btif_storage.h
- system/btif/src/btif_hh.cc 76 additions, 5 deletionssystem/btif/src/btif_hh.cc
- system/btif/src/btif_profile_storage.cc 49 additions, 1 deletionsystem/btif/src/btif_profile_storage.cc
- system/gd/rust/linux/stack/src/bluetooth.rs 2 additions, 2 deletionssystem/gd/rust/linux/stack/src/bluetooth.rs
- system/gd/rust/topshim/src/profiles/hid_host.rs 1 addition, 1 deletionsystem/gd/rust/topshim/src/profiles/hid_host.rs
- system/include/hardware/bt_hh.h 1 addition, 1 deletionsystem/include/hardware/bt_hh.h
Loading
Please register or sign in to comment