Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Unverified Commit 3054a65b authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-security-14.0.0_r12' of...

Merge tag 'android-security-14.0.0_r12' of https://android.googlesource.com/platform/packages/modules/Bluetooth into HEAD

Android security 14.0.0 release 12

* tag 'android-security-14.0.0_r12' of https://android.googlesource.com/platform/packages/modules/Bluetooth: (29 commits)
  Add support for checking security downgrade
  Disallow connect with key length downgrade
  Disallow connect with Secure Connections downgrade
  Fix heap-buffer overflow in sdp_utils.cc
  Fix permission bypasses to multiple methods
  Fix an authentication bypass bug in SMP
  Fix a security bypass issue in access_secure_service_from_temp_bond
  Reland: Fix an OOB write bug in attp_build_value_cmd
  Revert "Fix an OOB write bug in attp_build_value_cmd"
  Fix an OOB write bug in attp_build_value_cmd
  Fix an OOB bug in smp_proc_sec_req
  Revert "Fix an OOB write bug in attp_build_value_cmd"
  Fix an OOB write bug in attp_build_value_cmd
  Fix an OOB write bug in attp_build_read_by_type_value_cmd
  Fix an OOB bug in btif_to_bta_response and attp_build_value_cmd
  Fix some OOB errors in BTM parsing
  Fix timing attack in BTM_BleVerifySignature
  Fix an OOB bug in parse_gap_data
  Factor out duplicate code for parsing gap data
  [conflict] Merge "Add bounds checks in btif_avrcp_audio_track.cc" into tm-dev am: 0b68bd68 am: 52d169b1
  ...

 Conflicts:
	system/bta/le_audio/broadcaster/broadcaster.cc
	system/btif/src/btif_storage.cc
	system/include/hardware/bluetooth.h
	system/main/shim/Android.bp
	system/main/shim/le_advertising_manager.cc
	system/main/shim/utils.cc
	system/stack/a2dp/a2dp_vendor_opus_decoder.cc
	system/stack/btm/btm_ble.cc
	system/stack/btm/btm_ble_gap.cc
	system/stack/btm/btm_sec.cc
	system/stack/btm/btm_sec.h
	system/stack/btu/btu_hcif.cc
	system/stack/include/sec_hci_link_interface.h
	system/stack/sdp/sdp_utils.cc
	system/stack/smp/smp_act.cc
	system/test/headless/bt_property.cc
	system/test/mock/mock_stack_btm_sec.cc

Change-Id: I94943a37db4018aea218094662cd0b8a49ec847a
parents 5d908840 a1097edc
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment