OSDN Git Service

android-x86/system-bt.git
2 years agosecurity: Use-After-Free in btm_sec_[dis]connected
Chris Manton [Tue, 9 Nov 2021 00:45:42 +0000 (16:45 -0800)]
security: Use-After-Free in btm_sec_[dis]connected

Bug: 201083442
Tag: #security
Test: gd/cert/run
Ignore-AOSP-First: Security

Change-Id: I69c362d1eb644a3b7fd967cd526a8a58c3b4d975

2 years agoosi: Prevent memory allocations with MSB set
Chris Manton [Thu, 30 Sep 2021 00:49:25 +0000 (17:49 -0700)]
osi: Prevent memory allocations with MSB set

Limit allocations on 32bit to 2 GB
Limit allocations on 64bit to 8 Exabyte

Bug: 197868577
Tag: #refactor
Test: gd/cert/run
Ignore-AOSP-First: Security
Change-Id: I1c347084d7617b1e364a3241f1b37b398a2a6c6a

3 years agoSMP: Reject pairing if public_key.x match am: 9fbf77d1a8
Hansong Zhang [Thu, 24 Jun 2021 23:39:06 +0000 (23:39 +0000)]
SMP: Reject pairing if public_key.x match am: 9fbf77d1a8

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/15081352

Change-Id: I72ba8e45859116cfbcde52cce89bebd7aeaf6289

3 years agoSMP: Reject pairing if public_key.x match
Hansong Zhang [Mon, 7 Jun 2021 18:06:17 +0000 (11:06 -0700)]
SMP: Reject pairing if public_key.x match

Bug: 189329824
Test: POC
Test: pair an LE device
Change-Id: If6d8a72075f0cf657cadfab033cacffeb22868cb
Tag: #security

3 years agoFix memory overflow. am: 0d93359dbb
Richard Smith [Thu, 6 May 2021 12:42:06 +0000 (12:42 +0000)]
Fix memory overflow. am: 0d93359dbb

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/14424506

Change-Id: I22f05c6fc477e6b2bbe8af4541a9e69854787216

3 years agoFix memory overflow.
Richard Smith [Mon, 22 Feb 2021 14:25:43 +0000 (14:25 +0000)]
Fix memory overflow.

Bug: 180939982
Merged-In: I1be3b836e09901c9cc614b02e21ae41b9a1ebfac
Change-Id: I1be3b836e09901c9cc614b02e21ae41b9a1ebfac

3 years ago[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write...
Chris Manton [Tue, 6 Apr 2021 23:27:32 +0000 (23:27 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am: 4c9874d731 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13954699

Change-Id: Ie63fc83fde2308c3b8dffbf1939867b3e8ec5e7e

3 years agoRESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write
Chris Manton [Sun, 21 Mar 2021 22:51:18 +0000 (15:51 -0700)]
RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write

Bug: 181860042
Test: net_test_stack
Tag: #security
Ignore-AOSP-First: Security

Change-Id: I5d8d4051a1439ee9f1f04af3dfe6da6d8016e546

3 years agoRESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write
Chris Manton [Sun, 21 Mar 2021 22:51:18 +0000 (15:51 -0700)]
RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write

Bug: 181860042
Test: net_test_stack
Tag: #security
Ignore-AOSP-First: Security

Change-Id: I5d8d4051a1439ee9f1f04af3dfe6da6d8016e546

3 years agoMerge "AVRCP: pass bdaddr by value when use SdpCb" into pi-dev
TreeHugger Robot [Wed, 10 Mar 2021 01:55:07 +0000 (01:55 +0000)]
Merge "AVRCP: pass bdaddr by value when use SdpCb" into pi-dev

3 years ago[automerger skipped] smp: Reject pairing if the public keys match am: 8106ba3798...
Myles Watson [Fri, 5 Mar 2021 21:14:14 +0000 (21:14 +0000)]
[automerger skipped] smp: Reject pairing if the public keys match am: 8106ba3798 -s ours

am skip reason: Change-Id I0902fdf6bb5c1c7d443fc73fc480d51226fb836b with SHA-1 b7e176df4b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13522370

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d8d7fe30e1b5a805c4717f7c136562eb14f4b72

3 years agosmp: Reject pairing if the public keys match
Myles Watson [Mon, 8 Feb 2021 22:38:57 +0000 (14:38 -0800)]
smp: Reject pairing if the public keys match

Bug: 174886838
Test: pair an LE device
Tag: #security
Change-Id: I0902fdf6bb5c1c7d443fc73fc480d51226fb836b
Merged-In: I0902fdf6bb5c1c7d443fc73fc480d51226fb836b

3 years agoMerge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into pi-dev
TreeHugger Robot [Fri, 5 Mar 2021 06:58:41 +0000 (06:58 +0000)]
Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into pi-dev

3 years ago[automerger skipped] Merge "DO NOT MERGE : Re-land: SMP: Validate remote elliptic...
TreeHugger Robot [Fri, 5 Mar 2021 04:25:22 +0000 (04:25 +0000)]
[automerger skipped] Merge "DO NOT MERGE : Re-land: SMP: Validate remote elliptic curve points" into oc-mr1-dev am: cfc256e14d -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13756432

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2e529ad7118c58426893175823dd3c5cc424817

3 years agoMerge "avrcp: Ignore AVCT commands that are too long" into oc-mr1-dev am: c89971ccbb
TreeHugger Robot [Fri, 5 Mar 2021 04:25:17 +0000 (04:25 +0000)]
Merge "avrcp: Ignore AVCT commands that are too long" into oc-mr1-dev am: c89971ccbb

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13490135

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2eb64b02fbecffcb2927dd9a6157822076ec26fb

3 years agoMerge "DO NOT MERGE : Re-land: SMP: Validate remote elliptic curve points" into oc...
TreeHugger Robot [Thu, 4 Mar 2021 23:45:46 +0000 (23:45 +0000)]
Merge "DO NOT MERGE : Re-land: SMP: Validate remote elliptic curve points" into oc-mr1-dev

3 years agoMerge "avrcp: Ignore AVCT commands that are too long" into oc-mr1-dev
TreeHugger Robot [Thu, 4 Mar 2021 23:18:24 +0000 (23:18 +0000)]
Merge "avrcp: Ignore AVCT commands that are too long" into oc-mr1-dev

3 years agoDO NOT MERGE : Re-land: SMP: Validate remote elliptic curve points
Andre Eisenbach [Thu, 1 Mar 2018 21:27:01 +0000 (13:27 -0800)]
DO NOT MERGE : Re-land: SMP: Validate remote elliptic curve points

Fixes: 72377774
Test: net_test_stack_smp (where applicable)
(cherry picked from commit 9181ec28da94705a763edbe60bd2a87e5f882beb)
Change-Id: Ic38ad2f447a6a675025c84fd7746c9124f1eb324

3 years agoAVRCP: pass bdaddr by value when use SdpCb
Chienyuan [Mon, 8 Feb 2021 09:27:17 +0000 (17:27 +0800)]
AVRCP: pass bdaddr by value when use SdpCb

TAG: #security
Bug: 174182139
Test: compilation
Ignore-AOSP-First: security fix
Change-Id: Icd34986b6798e39c9b157588b943f5a883745129
Merged-In: I7f5b2a3dd0540a922b64ce213d871d355bd6dac6

3 years agosmp: Use SMP_TRACE_WARNING
Myles Watson [Wed, 3 Mar 2021 21:49:21 +0000 (13:49 -0800)]
smp: Use SMP_TRACE_WARNING

Bug: 174886838
Test: pair an LE device
Tag: #security
Change-Id: I3c7e0b1dd877dfa29fa0812c6a5e65fcb1d70ea7

3 years agosmp: Reject pairing if the public keys match
Myles Watson [Mon, 8 Feb 2021 22:38:57 +0000 (14:38 -0800)]
smp: Reject pairing if the public keys match

Bug: 174886838
Test: pair an LE device
Tag: #security
Change-Id: I0902fdf6bb5c1c7d443fc73fc480d51226fb836b
Merged-In: I0902fdf6bb5c1c7d443fc73fc480d51226fb836b

3 years agoavrcp: Ignore AVCT commands that are too long
Myles Watson [Fri, 5 Feb 2021 01:30:55 +0000 (17:30 -0800)]
avrcp: Ignore AVCT commands that are too long

Bug: 177611958
Test: compilation
Tag: #security
Change-Id: If914b5928cdf16696eb54bfe91c2869cbbf8e36c

3 years agoMerge "avrc_copy_packet: Zero initialize packet" into oc-mr1-dev am: 63480b1eee
Myles Watson [Wed, 3 Feb 2021 18:51:32 +0000 (18:51 +0000)]
Merge "avrc_copy_packet: Zero initialize packet" into oc-mr1-dev am: 63480b1eee

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13287217

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff120d88c8b6ef4016df7593e4e6fcd42426581a

3 years agoMerge "avrc_copy_packet: Zero initialize packet" into oc-mr1-dev
Myles Watson [Wed, 3 Feb 2021 18:30:15 +0000 (18:30 +0000)]
Merge "avrc_copy_packet: Zero initialize packet" into oc-mr1-dev

3 years agoDO NOT MERGE Add mutex for std::map in btif_av.cc
Chienyuan [Thu, 28 Jan 2021 06:08:17 +0000 (14:08 +0800)]
DO NOT MERGE Add mutex for std::map in btif_av.cc

TAG: #security
Bug: 169252501
Test: compilation
Ignore-AOSP-First: security fix
Change-Id: I592c0a9c0e77869999357611aa99f3d9bc53b8b6

3 years agoMerge "AVRCP: Use calloc to zero reserved fields" into pi-dev
TreeHugger Robot [Fri, 15 Jan 2021 17:20:28 +0000 (17:20 +0000)]
Merge "AVRCP: Use calloc to zero reserved fields" into pi-dev

3 years agoMerge "Legacy pairing: Reject device with same BD_ADDR" into oc-mr1-dev am: 93346eae3a
TreeHugger Robot [Thu, 7 Jan 2021 17:11:30 +0000 (17:11 +0000)]
Merge "Legacy pairing: Reject device with same BD_ADDR" into oc-mr1-dev am: 93346eae3a

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13180128

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I326bc7a210baab0d1367ec4ae49d5d76c37a5db8

3 years agoMerge "SDP: Only start discovery once" into oc-mr1-dev am: a472b9b2b4
TreeHugger Robot [Thu, 7 Jan 2021 17:11:24 +0000 (17:11 +0000)]
Merge "SDP: Only start discovery once" into oc-mr1-dev am: a472b9b2b4

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13202007

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8aec47cad617ef5d908677365ffba53dc16c5fb8

3 years ago[automerger skipped] AVRCP: Use calloc to zero reserved fields am: 8d461a866a -s...
Myles Watson [Thu, 7 Jan 2021 17:11:01 +0000 (17:11 +0000)]
[automerger skipped] AVRCP: Use calloc to zero reserved fields am: 8d461a866a -s ours

am skip reason: skipped by user mylesgw

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13204458

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide49f779dd1318246564d05173387dc7535e52ae

3 years agoAVRCP: Use calloc to zero reserved fields
Myles Watson [Fri, 4 Dec 2020 20:54:27 +0000 (12:54 -0800)]
AVRCP: Use calloc to zero reserved fields

Bug: 174150451
Test: compilation
Tag: #security
Change-Id: I7a30edacf8377a9feecbb988b099d60d69b46f87
(cherry picked from commit 1f169323d335ab0dc260952c2dd3821144448b11)
Merged-In: I7a30edacf8377a9feecbb988b099d60d69b46f87
(cherry picked from commit 8d461a866a12cd3d7d6d68551a5d2a7139fab2b9)

3 years agoMerge "Legacy pairing: Reject device with same BD_ADDR" into oc-mr1-dev
TreeHugger Robot [Wed, 6 Jan 2021 23:30:55 +0000 (23:30 +0000)]
Merge "Legacy pairing: Reject device with same BD_ADDR" into oc-mr1-dev

3 years agoMerge "SDP: Only start discovery once" into oc-mr1-dev
TreeHugger Robot [Wed, 6 Jan 2021 22:27:31 +0000 (22:27 +0000)]
Merge "SDP: Only start discovery once" into oc-mr1-dev

3 years agoavrc_copy_packet: Zero initialize packet
Hansong Zhang [Fri, 11 Dec 2020 19:56:15 +0000 (11:56 -0800)]
avrc_copy_packet: Zero initialize packet

Bug: 174149901
Change-Id: Iefa41749ebbacd34afaa24131de7ee25d706e23f
Tag: Security
Test: POC
(cherry picked from commit 960c3f3c9a1f912544b92b7a744e22069a0bc27e)

3 years agoAVRCP: Use calloc to zero reserved fields
Myles Watson [Fri, 4 Dec 2020 20:54:27 +0000 (12:54 -0800)]
AVRCP: Use calloc to zero reserved fields

Bug: 174150451
Test: compilation
Tag: #security
Change-Id: I7a30edacf8377a9feecbb988b099d60d69b46f87
(cherry picked from commit 1f169323d335ab0dc260952c2dd3821144448b11)
Merged-In: I7a30edacf8377a9feecbb988b099d60d69b46f87

3 years agoSDP: Only start discovery once
Myles Watson [Fri, 4 Dec 2020 02:54:14 +0000 (18:54 -0800)]
SDP: Only start discovery once

Bug: 174052148
Test: pair with headphones
Tag: #security
Change-Id: I1d014a7b793bb1b66e26652f6696499ea36a6510
(cherry picked from commit cfa5a74ea90a09e1c7413a25f04332ee2d1e3f21)
Merged-In: I1d014a7b793bb1b66e26652f6696499ea36a6510

3 years agoLegacy pairing: Reject device with same BD_ADDR
Hansong Zhang [Mon, 7 Dec 2020 21:11:10 +0000 (13:11 -0800)]
Legacy pairing: Reject device with same BD_ADDR

Change-Id: If3daec91c3d108a4e7e988608e0600c79ea5f053
Tag: #vulnerability
Test: manual
Bug: 174626251

3 years ago[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-dev...
TreeHugger Robot [Fri, 6 Nov 2020 07:14:25 +0000 (07:14 +0000)]
[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-dev am: 59304cd9d9 am: 16814b34fb -s ours am: 27feab80ac -s ours

am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1 ccbe059808 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12781555

Change-Id: Id5df4067761338488fab280586f4c3812c246e8d

3 years ago[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-dev...
TreeHugger Robot [Fri, 6 Nov 2020 06:55:53 +0000 (06:55 +0000)]
[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-dev am: 59304cd9d9 am: 16814b34fb -s ours

am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1 ccbe059808 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12781555

Change-Id: I28095eaddb51067420afdc51b3fb8245d65047fc

3 years agoMerge "Fix potential OOB write in libbluetooth" into oc-dev am: 59304cd9d9
TreeHugger Robot [Fri, 6 Nov 2020 06:20:03 +0000 (06:20 +0000)]
Merge "Fix potential OOB write in libbluetooth" into oc-dev am: 59304cd9d9

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12781555

Change-Id: I905bd02ad475b238005d0589a1c0171d842d7201

3 years ago[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-mr1...
TreeHugger Robot [Fri, 6 Nov 2020 06:19:52 +0000 (06:19 +0000)]
[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-mr1-dev am: e1aed6e373 -s ours

am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1 8216eda074 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12778874

Change-Id: I38e0bcf46b33e303fa1ee9e4a5981131935df028

3 years agoMerge "Fix potential OOB write in libbluetooth" into oc-mr1-dev
TreeHugger Robot [Fri, 6 Nov 2020 05:51:59 +0000 (05:51 +0000)]
Merge "Fix potential OOB write in libbluetooth" into oc-mr1-dev

3 years agoMerge "Fix potential OOB write in libbluetooth" into oc-dev
TreeHugger Robot [Fri, 6 Nov 2020 05:51:58 +0000 (05:51 +0000)]
Merge "Fix potential OOB write in libbluetooth" into oc-dev

3 years agoMerge "Fix potential OOB write in libbluetooth" into pi-dev
TreeHugger Robot [Fri, 6 Nov 2020 05:51:58 +0000 (05:51 +0000)]
Merge "Fix potential OOB write in libbluetooth" into pi-dev

3 years ago[automerger skipped] ACL: Drop broadcasts am: f91dbe2985 am: 10cfa5e827 am: e21d07e16...
Myles Watson [Fri, 6 Nov 2020 01:18:23 +0000 (01:18 +0000)]
[automerger skipped] ACL: Drop broadcasts am: f91dbe2985 am: 10cfa5e827 am: e21d07e16e -s ours

am skip reason: Change-Id Id4231fd7a142d630a2ada0f41a90e01afc011045 with SHA-1 83c32e8e8c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12951241

Change-Id: I2c0a49d927f48b823a808b45aa871768d0fff05c

3 years agoACL: Drop broadcasts am: f91dbe2985 am: 10cfa5e827
Myles Watson [Fri, 6 Nov 2020 01:05:27 +0000 (01:05 +0000)]
ACL: Drop broadcasts am: f91dbe2985 am: 10cfa5e827

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12951241

Change-Id: I2e274a4614d10187586949a742a9d6716778bc28

3 years agoACL: Drop broadcasts am: f91dbe2985
Myles Watson [Fri, 6 Nov 2020 00:51:21 +0000 (00:51 +0000)]
ACL: Drop broadcasts am: f91dbe2985

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12951241

Change-Id: I490deea8c83019ec92f6c76a276c50495cd40cdc

3 years agoACL: Drop broadcasts
Myles Watson [Thu, 29 Oct 2020 20:05:21 +0000 (13:05 -0700)]
ACL: Drop broadcasts

Bug: 169327567
Test: compiles
Tag: #security
Change-Id: Id4231fd7a142d630a2ada0f41a90e01afc011045
Merged-In: Id4231fd7a142d630a2ada0f41a90e01afc011045

3 years agoACL: Drop broadcasts
Myles Watson [Thu, 29 Oct 2020 20:05:21 +0000 (13:05 -0700)]
ACL: Drop broadcasts

Bug: 169327567
Test: compiles
Tag: #security
Change-Id: Id4231fd7a142d630a2ada0f41a90e01afc011045
Merged-In: Id4231fd7a142d630a2ada0f41a90e01afc011045

3 years agoFix a security issue in sdp_server.cc am: d7573f4fa9 am: 97abd549aa am: 5d2163956a
Hansong Zhang [Thu, 8 Oct 2020 19:26:52 +0000 (19:26 +0000)]
Fix a security issue in sdp_server.cc am: d7573f4fa9 am: 97abd549aa am: 5d2163956a

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12776129

Change-Id: I08de9b5e95e5c65b64ea3153a988c67520932a1e

3 years agoFix a security issue in sdp_server.cc am: d7573f4fa9 am: 97abd549aa
Hansong Zhang [Thu, 8 Oct 2020 19:14:34 +0000 (19:14 +0000)]
Fix a security issue in sdp_server.cc am: d7573f4fa9 am: 97abd549aa

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12776129

Change-Id: I1563f2793cc2d637be9935f04d9673e050dd0c67

3 years agoFix a security issue in sdp_server.cc am: d7573f4fa9
Hansong Zhang [Thu, 8 Oct 2020 19:00:20 +0000 (19:00 +0000)]
Fix a security issue in sdp_server.cc am: d7573f4fa9

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12776129

Change-Id: I017650c339df1f8dec41594e9d2d18d7f8d7fc6a

3 years agoFix potential OOB write in libbluetooth
Ted Wang [Tue, 6 Oct 2020 12:20:16 +0000 (20:20 +0800)]
Fix potential OOB write in libbluetooth

Check event id if of register notification command from remote to avoid
OOB write.

Tag: #security
Bug: 168802990
Test: atest net_test_btif

Change-Id: I90834b920d61bfb2df9414a25d73ba40033e4748
Merged-In: I90834b920d61bfb2df9414a25d73ba40033e4748

3 years agoFix potential OOB write in libbluetooth
Ted Wang [Tue, 6 Oct 2020 12:20:16 +0000 (20:20 +0800)]
Fix potential OOB write in libbluetooth

Check event id if of register notification command from remote to avoid
OOB write.

Tag: #security
Bug: 168802990
Test: atest net_test_btif

Change-Id: I90834b920d61bfb2df9414a25d73ba40033e4748
Merged-In: I90834b920d61bfb2df9414a25d73ba40033e4748

3 years agoFix potential OOB write in libbluetooth
Ted Wang [Tue, 6 Oct 2020 12:20:16 +0000 (20:20 +0800)]
Fix potential OOB write in libbluetooth

Check event id if of register notification command from remote to avoid
OOB write.

Tag: #security
Bug: 168802990
Test: atest net_test_btif

Change-Id: I90834b920d61bfb2df9414a25d73ba40033e4748
Merged-In: I90834b920d61bfb2df9414a25d73ba40033e4748

3 years agoFix a security issue in sdp_server.cc
Hansong Zhang [Tue, 6 Oct 2020 21:48:27 +0000 (14:48 -0700)]
Fix a security issue in sdp_server.cc

Bug: 169342531
Test: POC
Change-Id: I0e8cdb9a00184f62d11fb06bc30f07b2a35bc49e

3 years agoCheck Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0a...
Chen Chen [Tue, 6 Oct 2020 20:16:04 +0000 (20:16 +0000)]
Check Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0ae0ef9

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12736109

Change-Id: I7d010b57ab226b166d9895d95101056b2f305d31

3 years agoCheck Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87
Chen Chen [Tue, 6 Oct 2020 19:57:19 +0000 (19:57 +0000)]
Check Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12736109

Change-Id: I1391cb656ed035aaec7beb0f2c11e5b3c008f4cc

3 years agoCheck Classic key before cross-key derivation am: 814160abca
Chen Chen [Tue, 6 Oct 2020 18:52:36 +0000 (18:52 +0000)]
Check Classic key before cross-key derivation am: 814160abca

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12736109

Change-Id: I10b980c9f480dd9e2f2adb5af47cb23ff99421e6

3 years agoCheck Classic key before cross-key derivation
Chen Chen [Thu, 24 Sep 2020 00:02:58 +0000 (17:02 -0700)]
Check Classic key before cross-key derivation

Bug: 158854097
Test: atest net_test_stack_smp
Tag: #security
Ignore-AOSP-First: Security fix
Exempt-From-Owner-Approval: Already got owner approval,
but somehow it still shows no owner vote

Change-Id: Id88241324e9fb89ef14e50b52eb459a0d81c492b

3 years agoCheck Classic key before cross-key derivation am: 992e25e6b9
Chen Chen [Tue, 6 Oct 2020 03:59:17 +0000 (03:59 +0000)]
Check Classic key before cross-key derivation am: 992e25e6b9

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12736893

Change-Id: I7bad5de1a8d79930b54c7075405b75ee466fc3fa

3 years agoCheck Classic key before cross-key derivation
Chen Chen [Thu, 24 Sep 2020 00:02:58 +0000 (17:02 -0700)]
Check Classic key before cross-key derivation

Bug: 158854097
Test: atest net_test_stack_smp
Tag: #security
Ignore-AOSP-First: Security fix

Change-Id: Id88241324e9fb89ef14e50b52eb459a0d81c492b

3 years agoCheck Classic key before cross-key derivation
Chen Chen [Thu, 24 Sep 2020 00:02:58 +0000 (17:02 -0700)]
Check Classic key before cross-key derivation

Bug: 158854097
Test: atest net_test_stack_smp
Tag: #security
Ignore-AOSP-First: Security fix

Change-Id: Id88241324e9fb89ef14e50b52eb459a0d81c492b

3 years ago[automerger skipped] Merge "Send a response to an smp security request depending...
TreeHugger Robot [Mon, 31 Aug 2020 17:18:27 +0000 (17:18 +0000)]
[automerger skipped] Merge "Send a response to an smp security request depending on the callback event" into oc-dev am: 9f1c709363 am: 28de519df5 -s ours am: 9361f12bad -s ours

am skip reason: Change-Id Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 with SHA-1 1570e8de12 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12448858

Change-Id: I2fb43fe52f2214df67e87dc27ea95ba4f2d4c7fb

3 years ago[automerger skipped] Return after removing sample LTK device am: c6879c3fe5 am: bf693...
li-wei.cheng [Mon, 31 Aug 2020 17:18:20 +0000 (17:18 +0000)]
[automerger skipped] Return after removing sample LTK device am: c6879c3fe5 am: bf69312868 am: 74ebab6814 -s ours

am skip reason: Change-Id Iaa59f3c415dd8066849fd70912fdb83f890229d7 with SHA-1 7c86810c44 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12325453

Change-Id: I18dee0776a1cfec33193598750f27767e451b054

3 years ago[automerger skipped] Don't persist bonds using sample LTK am: 70411f0877 -s ours...
Jakub Pawlowski [Mon, 31 Aug 2020 17:18:10 +0000 (17:18 +0000)]
[automerger skipped] Don't persist bonds using sample LTK am: 70411f0877 -s ours am: f79ba4c65d

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12484285

Change-Id: I7382773a19a2b7b098f9ce1bdb5364723dafa546

3 years ago[automerger skipped] Merge "Send a response to an smp security request depending...
TreeHugger Robot [Mon, 31 Aug 2020 17:12:27 +0000 (17:12 +0000)]
[automerger skipped] Merge "Send a response to an smp security request depending on the callback event" into oc-dev am: 9f1c709363 am: 28de519df5 -s ours

am skip reason: Change-Id Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 with SHA-1 1570e8de12 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12448858

Change-Id: I97233565f3adeb025a2924e52a7f15353628bae7

3 years agoReturn after removing sample LTK device am: c6879c3fe5 am: bf69312868
li-wei.cheng [Mon, 31 Aug 2020 17:12:16 +0000 (17:12 +0000)]
Return after removing sample LTK device am: c6879c3fe5 am: bf69312868

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12325453

Change-Id: I16cf93538d6d706acd22876712fa615dd820d12e

3 years agoMerge "Send a response to an smp security request depending on the callback event...
TreeHugger Robot [Mon, 31 Aug 2020 17:04:23 +0000 (17:04 +0000)]
Merge "Send a response to an smp security request depending on the callback event" into oc-dev am: 9f1c709363

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12448858

Change-Id: I8857f2e8f4e7eee007bb1d1597b587a1965ca882

3 years agoReturn after removing sample LTK device am: c6879c3fe5
li-wei.cheng [Mon, 31 Aug 2020 17:04:06 +0000 (17:04 +0000)]
Return after removing sample LTK device am: c6879c3fe5

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12325453

Change-Id: I7bb17e11a74ed992191cd446408ee7bef4b984de

3 years ago[automerger skipped] Don't persist bonds using sample LTK am: 70411f0877 -s ours
Jakub Pawlowski [Mon, 31 Aug 2020 17:03:56 +0000 (17:03 +0000)]
[automerger skipped] Don't persist bonds using sample LTK am: 70411f0877 -s ours

am skip reason: skipped by user mylesgw

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12484285

Change-Id: Ia4bdeb2996c3bf7d7982f60a360b3790e542397d

3 years agoDon't persist bonds using sample LTK
Jakub Pawlowski [Mon, 11 Mar 2019 18:22:01 +0000 (19:22 +0100)]
Don't persist bonds using sample LTK

Test: compilation, manual testing
Bug: 128843052
Bug: 162497143
Merged-In: I52fd484d42bf87e96dbc9e6456090f231ed48111
Change-Id: I52fd484d42bf87e96dbc9e6456090f231ed48111
(cherry picked from commit 292fcf8612f488a2fcbf99614caba46ead076eb2)

3 years ago[automerger skipped] Send a response to an smp security request depending on the...
Rahul Sabnis [Fri, 28 Aug 2020 21:46:27 +0000 (21:46 +0000)]
[automerger skipped] Send a response to an smp security request depending on the callback event am: 1570e8de12 -s ours

am skip reason: Change-Id Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 with SHA-1 c3894d6360 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12448856

Change-Id: Ic9a3092bcbdcadf8aeb3f9a1c4ebfb5a23d7c89f

3 years agoMerge "Send a response to an smp security request depending on the callback event...
TreeHugger Robot [Fri, 28 Aug 2020 21:35:22 +0000 (21:35 +0000)]
Merge "Send a response to an smp security request depending on the callback event" into oc-dev

3 years agoMerge "Send a response to an smp security request depending on the callback event...
TreeHugger Robot [Fri, 28 Aug 2020 21:34:51 +0000 (21:34 +0000)]
Merge "Send a response to an smp security request depending on the callback event" into pi-dev

3 years agoSend a response to an smp security request depending on the callback event
Rahul Sabnis [Mon, 24 Aug 2020 23:36:36 +0000 (16:36 -0700)]
Send a response to an smp security request depending on the callback event

Tag: #feature
Bug: 157038281
Test: Manual
Merged-In: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351
Change-Id: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351

3 years agoSend a response to an smp security request depending on the callback event
Rahul Sabnis [Mon, 24 Aug 2020 23:36:36 +0000 (16:36 -0700)]
Send a response to an smp security request depending on the callback event

Tag: #feature
Bug: 157038281
Test: Manual
Merged-In: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351
Change-Id: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351

3 years agoSend a response to an smp security request depending on the callback event
Rahul Sabnis [Mon, 24 Aug 2020 23:36:36 +0000 (16:36 -0700)]
Send a response to an smp security request depending on the callback event

Tag: #feature
Bug: 157038281
Test: Manual
Merged-In: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351
Change-Id: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351

3 years agoReturn after removing sample LTK device
li-wei.cheng [Mon, 20 Jan 2020 07:27:21 +0000 (15:27 +0800)]
Return after removing sample LTK device

Return directly after calling bta_dm_remove_device to
prevent from accessing the invalid security record (p_dev_rec).

Test: Hardcode to test bond with sample key
Tag: #security
Bug: 162497143
Change-Id: Iaa59f3c415dd8066849fd70912fdb83f890229d7
Merged-In: Iaa59f3c415dd8066849fd70912fdb83f890229d7

3 years agoReturn after removing sample LTK device
li-wei.cheng [Mon, 20 Jan 2020 07:27:21 +0000 (15:27 +0800)]
Return after removing sample LTK device

Return directly after calling bta_dm_remove_device to
prevent from accessing the invalid security record (p_dev_rec).

Test: Hardcode to test bond with sample key
Tag: #security
Bug: 162497143
Change-Id: Iaa59f3c415dd8066849fd70912fdb83f890229d7

3 years ago[automerger skipped] Merge "Check whether local device is an ATV device to determine...
Rahul Sabnis [Wed, 5 Aug 2020 21:53:28 +0000 (21:53 +0000)]
[automerger skipped] Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into oc-dev am: b2adda8177 am: 00fd683aec -s ours am: 14ae20b072 -s ours

am skip reason: Change-Id I6d06f5996da71e5a1407e544b0023d82924aa56f with SHA-1 0b4c1014f7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12309020

Change-Id: I345e6523f88819ffd331090c3d1671cd480641c6

3 years ago[automerger skipped] Merge "Check whether local device is an ATV device to determine...
Rahul Sabnis [Wed, 5 Aug 2020 21:35:45 +0000 (21:35 +0000)]
[automerger skipped] Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into oc-dev am: b2adda8177 am: 00fd683aec -s ours

am skip reason: Change-Id I6d06f5996da71e5a1407e544b0023d82924aa56f with SHA-1 0b4c1014f7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12309020

Change-Id: I64045645e5b0c45d25f239f52070f796e8162077

3 years agoMerge "Check whether local device is an ATV device to determine whether to show the...
Rahul Sabnis [Wed, 5 Aug 2020 21:18:10 +0000 (21:18 +0000)]
Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into oc-dev am: b2adda8177

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12309020

Change-Id: I3cc71adac1897fb29ce5fb4012ed8b1567f1e614

3 years ago[automerger skipped] Merge "Check whether local device is an ATV device to determine...
Rahul Sabnis [Wed, 5 Aug 2020 21:17:00 +0000 (21:17 +0000)]
[automerger skipped] Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into oc-mr1-dev am: 4256337c9e -s ours

am skip reason: Change-Id I6d06f5996da71e5a1407e544b0023d82924aa56f with SHA-1 ad8fba09ac is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12307949

Change-Id: Icdcade676ae8c5cf2b05f42ce92611c97afd2b68

3 years agoMerge "Check whether local device is an ATV device to determine whether to show the...
Rahul Sabnis [Wed, 5 Aug 2020 20:56:23 +0000 (20:56 +0000)]
Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into oc-dev

3 years agoMerge "Check whether local device is an ATV device to determine whether to show the...
Rahul Sabnis [Wed, 5 Aug 2020 20:51:45 +0000 (20:51 +0000)]
Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into oc-mr1-dev

3 years agoMerge "Check whether local device is an ATV device to determine whether to show the...
TreeHugger Robot [Wed, 5 Aug 2020 18:56:04 +0000 (18:56 +0000)]
Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into pi-dev

3 years ago[automerger skipped] Fix possible OOB when receive gatt read type response data am...
weichinweng [Wed, 5 Aug 2020 12:32:35 +0000 (12:32 +0000)]
[automerger skipped] Fix possible OOB when receive gatt read type response data am: 342cb328b6 am: 6d86ead0e3 -s ours am: 4e8d3b8eba -s ours

am skip reason: Change-Id I1bd8713eecebc2bc3d919402b035987e06a2d4d3 with SHA-1 0eb7a763df is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12263265

Change-Id: Ia454d830d9e5e11883b83de17461b88d1c3d6a89

3 years ago[automerger skipped] Fix possible OOB when receive gatt read type response data am...
weichinweng [Wed, 5 Aug 2020 12:13:40 +0000 (12:13 +0000)]
[automerger skipped] Fix possible OOB when receive gatt read type response data am: 342cb328b6 am: 6d86ead0e3 -s ours

am skip reason: Change-Id I1bd8713eecebc2bc3d919402b035987e06a2d4d3 with SHA-1 0eb7a763df is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12263265

Change-Id: I0e10ba38b8aa463e7524ca0da1c2aa8ce5c86b5b

3 years agoFix possible OOB when receive gatt read type response data am: 342cb328b6
weichinweng [Wed, 5 Aug 2020 11:59:47 +0000 (11:59 +0000)]
Fix possible OOB when receive gatt read type response data am: 342cb328b6

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12263265

Change-Id: I064b5c88b2734129a9f1811f372713b01938ad9c

3 years agoFix possible OOB when receive gatt read type response data am: 0eb7a763df
weichinweng [Wed, 5 Aug 2020 08:26:01 +0000 (08:26 +0000)]
Fix possible OOB when receive gatt read type response data am: 0eb7a763df

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12258750

Change-Id: I941c06817ca42034d8cc6e74aae49cf4fc1e4dbc

3 years agoFix possible OOB when receive gatt read type response data
weichinweng [Tue, 28 Jul 2020 08:56:33 +0000 (16:56 +0800)]
Fix possible OOB when receive gatt read type response data

Bug: 158833854
Bug: 158778659
Test: manual
Tag: #security

Change-Id: I1bd8713eecebc2bc3d919402b035987e06a2d4d3
Merged-In: I1bd8713eecebc2bc3d919402b035987e06a2d4d3

3 years agoCheck whether local device is an ATV device to determine whether to show
Rahul Sabnis [Sat, 1 Aug 2020 02:44:27 +0000 (19:44 -0700)]
Check whether local device is an ATV device to determine whether to show
the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode

Tag: #feature
Bug: 157038281
Test: Manual
Merged-In: I6d06f5996da71e5a1407e544b0023d82924aa56f
Change-Id: I6d06f5996da71e5a1407e544b0023d82924aa56f

3 years agoCheck whether local device is an ATV device to determine whether to show
Rahul Sabnis [Sat, 1 Aug 2020 02:44:27 +0000 (19:44 -0700)]
Check whether local device is an ATV device to determine whether to show
the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode

Tag: #feature
Bug: 157038281
Test: Manual
Merged-In: I6d06f5996da71e5a1407e544b0023d82924aa56f
Change-Id: I6d06f5996da71e5a1407e544b0023d82924aa56f

3 years agoCheck whether local device is an ATV device to determine whether to show
Rahul Sabnis [Sat, 1 Aug 2020 02:44:27 +0000 (19:44 -0700)]
Check whether local device is an ATV device to determine whether to show
the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode

Tag: #feature
Bug: 157038281
Test: Manual
Merged-In: I6d06f5996da71e5a1407e544b0023d82924aa56f
Change-Id: I6d06f5996da71e5a1407e544b0023d82924aa56f

3 years agoFix possible OOB when receive gatt read type response data
weichinweng [Tue, 28 Jul 2020 08:56:33 +0000 (16:56 +0800)]
Fix possible OOB when receive gatt read type response data

Bug: 158833854
Bug: 158778659
Test: manual
Tag: #security

Change-Id: I1bd8713eecebc2bc3d919402b035987e06a2d4d3

3 years ago[automerger skipped] Shows a consent dialog on the local device when pairing a blueto...
Rahul Sabnis [Fri, 31 Jul 2020 01:09:09 +0000 (01:09 +0000)]
[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: 57ffe1ba12 am: 70e77e9a2f -s ours am: 459630e366 -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 b5c0bfc132 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12040226

Change-Id: I7e5b93e63eadbda49fc9ff28a6308a72e99b6ef0

3 years ago[automerger skipped] Shows a consent dialog on the local device when pairing a blueto...
Rahul Sabnis [Fri, 31 Jul 2020 00:51:00 +0000 (00:51 +0000)]
[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: 57ffe1ba12 am: 70e77e9a2f -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 b5c0bfc132 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12040226

Change-Id: I5ad01f31ae5ad09d350a04ff3414ae516ad0077d

3 years agoShows a consent dialog on the local device when pairing a bluetooth low am: 57ffe1ba12
Rahul Sabnis [Fri, 31 Jul 2020 00:27:46 +0000 (00:27 +0000)]
Shows a consent dialog on the local device when pairing a bluetooth low am: 57ffe1ba12

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12040226

Change-Id: I591af4f49890b67d9d110747984e1061aeaa9a57

3 years ago[automerger skipped] Shows a consent dialog on the local device when pairing a blueto...
Rahul Sabnis [Fri, 31 Jul 2020 00:11:56 +0000 (00:11 +0000)]
[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am: b5c0bfc132 -s ours

am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1 8709264b5c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12040225

Change-Id: Ibf60879048f2eea001a0b5c3cf4f9a4fcdb3edd6

4 years agoShows a consent dialog on the local device when pairing a bluetooth low
Rahul Sabnis [Fri, 26 Jun 2020 17:27:07 +0000 (10:27 -0700)]
Shows a consent dialog on the local device when pairing a bluetooth low
energy device if the local device has a display.

Tag: #security
Bug: 157038281
Test: Manual
Merged-In: I7de396230beb84bd0fa2b0cea346523b6824472a
Change-Id: I7de396230beb84bd0fa2b0cea346523b6824472a