OSDN Git Service
Chris Manton [Wed, 6 Oct 2021 18:39:24 +0000 (18:39 +0000)]
osi: Prevent memory allocations with MSB set am:
cee4d086c9 am:
1812f99793 am:
85a3510912 am:
7300b01716
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959762
Change-Id: I60ce82f68eb256b8a786f8127fe21c38d0ee1833
Chris Manton [Wed, 6 Oct 2021 18:39:20 +0000 (18:39 +0000)]
osi: Prevent memory allocations with MSB set am:
1e76ec66d8 am:
32249b0602 am:
d65173898e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959601
Change-Id: I7c21d6dfe0efe6812259cea7b839120a3cd58ac1
Chris Manton [Wed, 6 Oct 2021 18:23:49 +0000 (18:23 +0000)]
osi: Prevent memory allocations with MSB set am:
cee4d086c9 am:
1812f99793 am:
85a3510912
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959762
Change-Id: Ice95438b8dbce78342490c360887246f7c5a1cb6
Chris Manton [Wed, 6 Oct 2021 18:23:45 +0000 (18:23 +0000)]
osi: Prevent memory allocations with MSB set am:
1e76ec66d8 am:
32249b0602
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959601
Change-Id: I169567991117522a820ee5140e8bad2b1444e2e7
Chris Manton [Wed, 6 Oct 2021 18:13:10 +0000 (18:13 +0000)]
osi: Prevent memory allocations with MSB set am:
cee4d086c9 am:
1812f99793
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959762
Change-Id: Ie5cfe615061877d55b80ca411aba92629eb81583
Chris Manton [Wed, 6 Oct 2021 18:09:25 +0000 (18:09 +0000)]
osi: Prevent memory allocations with MSB set am:
cee4d086c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959762
Change-Id: I29728cd50670ba60bf42f4142aa302f79d6ed9e3
Chris Manton [Wed, 6 Oct 2021 18:09:15 +0000 (18:09 +0000)]
osi: Prevent memory allocations with MSB set am:
e435404a7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959600
Change-Id: Id94265b102135a390aa798b3b682530bc8c33625
Chris Manton [Wed, 6 Oct 2021 18:08:26 +0000 (18:08 +0000)]
osi: Prevent memory allocations with MSB set am:
1e76ec66d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15959601
Change-Id: I3f033ec55080fbb2d924662b20d5e09a89a00c51
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
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
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
Hansong Zhang [Fri, 25 Jun 2021 00:39:20 +0000 (00:39 +0000)]
SMP: Reject pairing if public_key.x match am:
9fbf77d1a8 am:
6dd3a7aa69 am:
351d594583 am:
cf11884e7c am:
fb9f699d79
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15081352
Change-Id: I722d373d4c77fd8094bfcd7abed678c89e8d226b
Hansong Zhang [Fri, 25 Jun 2021 00:26:04 +0000 (00:26 +0000)]
SMP: Reject pairing if public_key.x match am:
9fbf77d1a8 am:
6dd3a7aa69 am:
351d594583 am:
cf11884e7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15081352
Change-Id: Ife13fd9bc5326d8ada38cb2f762a70ba79d35752
Hansong Zhang [Fri, 25 Jun 2021 00:03:34 +0000 (00:03 +0000)]
SMP: Reject pairing if public_key.x match am:
9fbf77d1a8 am:
6dd3a7aa69 am:
351d594583
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15081352
Change-Id: I1905e2f230957e9d7423e0b3b03e5c008f9ca55c
Hansong Zhang [Thu, 24 Jun 2021 23:52:22 +0000 (23:52 +0000)]
SMP: Reject pairing if public_key.x match am:
9fbf77d1a8 am:
6dd3a7aa69
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
15081352
Change-Id: I10e4fd768a27480bc16939b99f631c574b3042a4
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
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
TreeHugger Robot [Fri, 14 May 2021 17:19:10 +0000 (17:19 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write" into qt-qpr1-dev am:
454fdc7be9 -s ours am:
ebe70e97c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
14452688
Change-Id: I42e6498e063827819f158e7c30ce8095274b6401
TreeHugger Robot [Thu, 13 May 2021 01:33:47 +0000 (01:33 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write" into qt-qpr1-dev am:
454fdc7be9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
14452688
Change-Id: I77b1c51ea375ae50b2a0973e9235b544a5dc8eed
TreeHugger Robot [Thu, 13 May 2021 01:21:30 +0000 (01:21 +0000)]
Merge "RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write" into qt-qpr1-dev
Richard Smith [Thu, 6 May 2021 16:16:50 +0000 (16:16 +0000)]
Fix memory overflow. am:
0d93359dbb am:
4feb117a78 am:
0b62f0ebdf am:
500bd8b07c am:
0fa27964c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
14424506
Change-Id: Ic434110a975deb5f01b7aa3d879f9ff2daccaa71
Chris Manton [Thu, 6 May 2021 16:16:42 +0000 (16:16 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
4c9874d731 -s ours am:
e59c51d7f9 -s ours am:
5db6896649 am:
24c0d80295 -s ours am:
318b99bbce
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954699
Change-Id: I107be2e1ea8528f95ae014ce9117b28bf9ae0e8d
TreeHugger Robot [Thu, 6 May 2021 16:16:38 +0000 (16:16 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write" into qt-dev am:
f819730c62 am:
7a2d18ef0a -s ours am:
364371b9a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954701
Change-Id: Id2804ace180c643cb4fd8fe09f0159c27e44b6a4
Chris Manton [Thu, 6 May 2021 16:16:37 +0000 (16:16 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
d667a2f6d0 -s ours am:
467701e9c8 -s ours am:
d590155628
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954701
Change-Id: I854753665062ccf83b126891e57d4e7eb45f0c51
Richard Smith [Thu, 6 May 2021 16:00:28 +0000 (16:00 +0000)]
Fix memory overflow. am:
0d93359dbb am:
4feb117a78 am:
0b62f0ebdf am:
500bd8b07c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
14424506
Change-Id: I6bb6e60065518d9641fa77857b61683f8baa26cf
Chris Manton [Thu, 6 May 2021 16:00:19 +0000 (16:00 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
4c9874d731 -s ours am:
e59c51d7f9 -s ours am:
5db6896649 am:
24c0d80295 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954699
Change-Id: I43c29ba819826b56a3549885938f8179fbfe8e04
TreeHugger Robot [Thu, 6 May 2021 16:00:05 +0000 (16:00 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write" into qt-dev am:
f819730c62 am:
7a2d18ef0a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954701
Change-Id: I5d79a3a7966ab6fa7b6cd37354e552b5070b3966
Chris Manton [Thu, 6 May 2021 16:00:02 +0000 (16:00 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
d667a2f6d0 -s ours am:
467701e9c8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954701
Change-Id: I2079fb2b8678aee870c8748b13ced769b72891d0
Richard Smith [Thu, 6 May 2021 15:45:21 +0000 (15:45 +0000)]
Fix memory overflow. am:
0d93359dbb am:
4feb117a78 am:
0b62f0ebdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
14424506
Change-Id: I72589c4284074ca76bdc7f27fc2394d84e5125a6
Chris Manton [Thu, 6 May 2021 15:45:13 +0000 (15:45 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
4c9874d731 -s ours am:
e59c51d7f9 -s ours am:
5db6896649
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954699
Change-Id: I3fc0547226195145cb7d5ae36e23c229d154683a
TreeHugger Robot [Thu, 6 May 2021 15:45:03 +0000 (15:45 +0000)]
Merge "RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write" into qt-dev am:
f819730c62
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954701
Change-Id: Iee27d0a5c0ae2645f7a843336ceaf91a2552f6fa
Chris Manton [Thu, 6 May 2021 15:45:01 +0000 (15:45 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
d667a2f6d0 -s ours
am skip reason: skipped by user cmanton
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954701
Change-Id: I0bda5654aa90b136fef137dc6e24176c9888ff78
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
(cherry picked from commit
4deeb022c7efe39e9ce34d9373ba900d9ed2741f)
Richard Smith [Thu, 6 May 2021 13:14:05 +0000 (13:14 +0000)]
Fix memory overflow. am:
0d93359dbb am:
4feb117a78
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
14424506
Change-Id: If03b2528de76c1be7bba7eb620f31aee5aba80d2
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
Richard Smith [Mon, 22 Feb 2021 14:25:43 +0000 (14:25 +0000)]
Fix memory overflow.
Bug:
180939982
Merged-In: I1be3b836e09901c9cc614b02e21ae41b9a1ebfac
Change-Id: I1be3b836e09901c9cc614b02e21ae41b9a1ebfac
Chris Manton [Thu, 29 Apr 2021 22:23:06 +0000 (22:23 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
2901716406 -s ours am:
98e2be17dd am:
0659d4ab56 -s ours am:
344adb8765
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954700
Change-Id: Iee06b42ad400e080c618b33f2df735c36bf68f0f
TreeHugger Robot [Thu, 29 Apr 2021 22:22:57 +0000 (22:22 +0000)]
[automerger skipped] Merge "AVRCP: pass bdaddr by value when use SdpCb" into pi-dev am:
529b824a10 am:
0c4a707110 am:
b44e756312 -s ours am:
034a93aada -s ours
am skip reason: Merged-In I7f5b2a3dd0540a922b64ce213d871d355bd6dac6 with SHA-1
71c573ae67 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13516705
Change-Id: I6180100d4019018762c9533889467c61f3e65220
Chris Manton [Thu, 29 Apr 2021 21:59:46 +0000 (21:59 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
2901716406 -s ours am:
98e2be17dd am:
0659d4ab56 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954700
Change-Id: Ic4bb2c4615c9b1501aae916026387f3bf7714170
TreeHugger Robot [Thu, 29 Apr 2021 21:59:34 +0000 (21:59 +0000)]
[automerger skipped] Merge "AVRCP: pass bdaddr by value when use SdpCb" into pi-dev am:
529b824a10 am:
0c4a707110 am:
b44e756312 -s ours
am skip reason: Merged-In I7f5b2a3dd0540a922b64ce213d871d355bd6dac6 with SHA-1
71c573ae67 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13516705
Change-Id: Iab9c72d42c690266379a05974b868ee5bfd0eb24
Chris Manton [Tue, 6 Apr 2021 23:52:22 +0000 (23:52 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
4c9874d731 -s ours am:
e59c51d7f9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954699
Change-Id: I21299d11012b7aae72fc97ce8bc2d6bbbda3b48c
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
TreeHugger Robot [Tue, 6 Apr 2021 22:20:54 +0000 (22:20 +0000)]
Merge "RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write" into qt-dev
Chris Manton [Tue, 6 Apr 2021 21:49:02 +0000 (21:49 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
2901716406 -s ours am:
98e2be17dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954700
Change-Id: Ia36b28dea2d4e3bc67ef4ed7c8b7280c7a7fb700
Chris Manton [Tue, 6 Apr 2021 21:33:28 +0000 (21:33 +0000)]
RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
4deeb022c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954702
Change-Id: Ic73065a6d1331e4202cf3aa7863994ec36c2a8c5
Chris Manton [Tue, 6 Apr 2021 21:11:49 +0000 (21:11 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
2901716406 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954700
Change-Id: I1a5f213361798d7e22a5827ce1e42249af05aa59
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
TreeHugger Robot [Fri, 2 Apr 2021 00:57:55 +0000 (00:57 +0000)]
Merge "Check packet size in avrc_pars_browse_rsp" into rvc-dev am:
05401e8739
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13563503
Change-Id: Ia6330f75600e3acd96a0025026c3568a391c7777
TreeHugger Robot [Fri, 2 Apr 2021 00:22:29 +0000 (00:22 +0000)]
Merge "Check packet size in avrc_pars_browse_rsp" into rvc-dev
Chienyuan [Thu, 1 Apr 2021 04:01:12 +0000 (04:01 +0000)]
AVRCP: pass bdaddr by value when use SdpCb am:
71c573ae67
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13838867
Change-Id: I243ee6b18962d6ebedab62a2499ed7f1940cb98b
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
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
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
Chienyuan [Fri, 19 Feb 2021 12:05:20 +0000 (20:05 +0800)]
AVRCP: pass bdaddr by value when use SdpCb
TAG: #security
Bug:
174182139
Test: compilation
Ignore-AOSP-First: security fix
Change-Id: I7f5b2a3dd0540a922b64ce213d871d355bd6dac6
Merged-In: I7f5b2a3dd0540a922b64ce213d871d355bd6dac6
TreeHugger Robot [Wed, 10 Mar 2021 04:30:50 +0000 (04:30 +0000)]
Merge "AVRCP: pass bdaddr by value when use SdpCb" into pi-dev am:
529b824a10 am:
0c4a707110
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13516705
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9c5c3c95e0b5ff3d1ce307b8a1a41555e3def863
TreeHugger Robot [Wed, 10 Mar 2021 02:37:33 +0000 (02:37 +0000)]
Merge "AVRCP: pass bdaddr by value when use SdpCb" into pi-dev am:
529b824a10
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13516705
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2074374898d9695c550034ff48be0a4b8aaa0383
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
Myles Watson [Fri, 5 Mar 2021 23:35:12 +0000 (23:35 +0000)]
[automerger skipped] smp: Reject pairing if the public keys match am:
8106ba3798 -s ours am:
75314b8d92 -s ours am:
4d251c8338 -s ours am:
01b3bccf19 -s ours am:
b2d9ae3640 -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: I7a1ee36ae740afe8609e78e976bdf1558dfe312e
Myles Watson [Fri, 5 Mar 2021 22:50:24 +0000 (22:50 +0000)]
[automerger skipped] smp: Reject pairing if the public keys match am:
8106ba3798 -s ours am:
75314b8d92 -s ours am:
4d251c8338 -s ours am:
01b3bccf19 -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: I69ea6b555c84d0a1bb23acb043dfdb419c643d5e
Myles Watson [Fri, 5 Mar 2021 22:31:28 +0000 (22:31 +0000)]
[automerger skipped] smp: Reject pairing if the public keys match am:
8106ba3798 -s ours am:
75314b8d92 -s ours am:
4d251c8338 -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: I1e17396812c90f45bd3fcf2170656928d552aef1
Myles Watson [Fri, 5 Mar 2021 21:56:15 +0000 (21:56 +0000)]
[automerger skipped] smp: Reject pairing if the public keys match am:
8106ba3798 -s ours am:
75314b8d92 -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: Idb25a8fc4e94ac3ec87a6fdf398fb311b53d1cdd
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
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
TreeHugger Robot [Fri, 5 Mar 2021 08:07:58 +0000 (08:07 +0000)]
[automerger skipped] Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into pi-dev am:
683f95562b -s ours am:
63e5f9a0ef am:
c3a5b5b006 -s ours am:
6696abc0b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13422723
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I812b6257f68f0d8b1b83685fa69e5de4ecf7d5aa
TreeHugger Robot [Fri, 5 Mar 2021 08:07:52 +0000 (08:07 +0000)]
[automerger skipped] Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into qt-dev am:
8a6fe7c3d9 am:
bc5632c80f -s ours am:
19c5352594
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13425806
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie228842f0dd1b0e8b8d34bd90809e79bbd222379
Chienyuan [Fri, 5 Mar 2021 08:07:50 +0000 (08:07 +0000)]
[automerger skipped] DO NOT MERGE Add mutex for std::map in btif_av.cc am:
f230ef243e am:
df8b0e90b0 -s ours am:
324b8b0bd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13425806
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id401aae790266cf8b1aae8feec5582381e54efd4
TreeHugger Robot [Fri, 5 Mar 2021 08:03:17 +0000 (08:03 +0000)]
[automerger skipped] Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into pi-dev am:
683f95562b -s ours am:
63e5f9a0ef am:
c3a5b5b006 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13422723
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I91475cfec74d34a5ae7b4db71cb0ef21cbc673d3
TreeHugger Robot [Fri, 5 Mar 2021 07:44:53 +0000 (07:44 +0000)]
[automerger skipped] Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into pi-dev am:
683f95562b -s ours am:
63e5f9a0ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13422723
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5729d1ef17f6f2d55395e4518224d7ff131759a5
TreeHugger Robot [Fri, 5 Mar 2021 07:44:49 +0000 (07:44 +0000)]
[automerger skipped] Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into qt-dev am:
8a6fe7c3d9 am:
bc5632c80f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13425806
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iec00c49e1b6f6951cb3022ef6f7eeb6b6343bd71
Chienyuan [Fri, 5 Mar 2021 07:44:46 +0000 (07:44 +0000)]
[automerger skipped] DO NOT MERGE Add mutex for std::map in btif_av.cc am:
f230ef243e am:
df8b0e90b0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13425806
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I425dddcb2f89486ff43c2c2d9e3badf2948e0408
TreeHugger Robot [Fri, 5 Mar 2021 07:27:29 +0000 (07:27 +0000)]
[automerger skipped] Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into pi-dev am:
683f95562b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13422723
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iad562f0bc9e68b3adc0fc6a4ee6a89bc35f66648
TreeHugger Robot [Fri, 5 Mar 2021 07:23:03 +0000 (07:23 +0000)]
Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into qt-dev am:
8a6fe7c3d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13425806
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0fb525ed5e51224ae7229721d1f75c2c1d58a0c4
Chienyuan [Fri, 5 Mar 2021 07:23:01 +0000 (07:23 +0000)]
DO NOT MERGE Add mutex for std::map in btif_av.cc am:
f230ef243e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13425806
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia2216b584ad62cf1b0ece43dbc113e68c5f717c3
TreeHugger Robot [Fri, 5 Mar 2021 07:06:37 +0000 (07:06 +0000)]
Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into rvc-dev am:
43c129c9be
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13425807
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I908db5b02d91112d78691ae331ac464cb280ce3e
Chienyuan [Fri, 5 Mar 2021 07:06:36 +0000 (07:06 +0000)]
DO NOT MERGE Add mutex for std::map in btif_av.cc am:
1be5b0d940
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13425807
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I01c47480cba70f7636dbfdbab909996fffb85364
TreeHugger Robot [Fri, 5 Mar 2021 07:06:31 +0000 (07:06 +0000)]
[automerger skipped] Merge "DO NOT MERGE : Re-land: SMP: Validate remote elliptic curve points" into oc-mr1-dev am:
cfc256e14d -s ours am:
ec2cdfc472 -s ours am:
b778451782 am:
7c13c57728 -s ours am:
43b7303bd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13756432
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6e5cb805ec130a322acdcbb5308811dbda6393ed
TreeHugger Robot [Fri, 5 Mar 2021 07:06:24 +0000 (07:06 +0000)]
Merge "avrcp: Ignore AVCT commands that are too long" into oc-mr1-dev am:
c89971ccbb am:
c1282f371b am:
fc6a2327ac am:
b01c117452 am:
ac3fb23588
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13490135
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id0bd9dbb76470423ce577c44304c6a87d43197eb
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
TreeHugger Robot [Fri, 5 Mar 2021 06:54:19 +0000 (06:54 +0000)]
Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into rvc-dev
TreeHugger Robot [Fri, 5 Mar 2021 06:54:01 +0000 (06:54 +0000)]
Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into qt-dev
TreeHugger Robot [Fri, 5 Mar 2021 06:15:47 +0000 (06:15 +0000)]
[automerger skipped] Merge "DO NOT MERGE : Re-land: SMP: Validate remote elliptic curve points" into oc-mr1-dev am:
cfc256e14d -s ours am:
ec2cdfc472 -s ours am:
b778451782 am:
7c13c57728 -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: I5c72d7510d4040f7ca24056bc3e9ea30446318d2
TreeHugger Robot [Fri, 5 Mar 2021 06:15:35 +0000 (06:15 +0000)]
Merge "avrcp: Ignore AVCT commands that are too long" into oc-mr1-dev am:
c89971ccbb am:
c1282f371b am:
fc6a2327ac am:
b01c117452
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13490135
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If7045749c4f2925f0a638650abdda13490db2e63
TreeHugger Robot [Fri, 5 Mar 2021 05:54:58 +0000 (05:54 +0000)]
[automerger skipped] Merge "DO NOT MERGE : Re-land: SMP: Validate remote elliptic curve points" into oc-mr1-dev am:
cfc256e14d -s ours am:
ec2cdfc472 -s ours am:
b778451782
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13756432
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e1dc81731f98a1f4d12f04d9466829b5a223bf4
TreeHugger Robot [Fri, 5 Mar 2021 05:54:51 +0000 (05:54 +0000)]
Merge "avrcp: Ignore AVCT commands that are too long" into oc-mr1-dev am:
c89971ccbb am:
c1282f371b am:
fc6a2327ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13490135
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If42003a10b559a9e8dd9a0c0732958ac98c78911
TreeHugger Robot [Fri, 5 Mar 2021 05:12:39 +0000 (05:12 +0000)]
[automerger skipped] Merge "DO NOT MERGE : Re-land: SMP: Validate remote elliptic curve points" into oc-mr1-dev am:
cfc256e14d -s ours am:
ec2cdfc472 -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: Ifd7eb81d9b7a75384ee20175174550fa06900364
TreeHugger Robot [Fri, 5 Mar 2021 05:12:31 +0000 (05:12 +0000)]
Merge "avrcp: Ignore AVCT commands that are too long" into oc-mr1-dev am:
c89971ccbb am:
c1282f371b
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13490135
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4cdb26816f81d622d9aed94f176a7cfd2360b1b8
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
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
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
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
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
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
Myles Watson [Thu, 4 Mar 2021 03:27:20 +0000 (03:27 +0000)]
smp: Use SMP_TRACE_WARNING am:
4567823871 am:
3d5118b2ae am:
db97c71539 am:
7447be7dd5
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13758553
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0f7971698a93b09d635ea9c804c14eb341bcb865
Myles Watson [Thu, 4 Mar 2021 01:42:15 +0000 (01:42 +0000)]
smp: Use SMP_TRACE_WARNING am:
4567823871 am:
3d5118b2ae am:
db97c71539
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13758553
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iccb68d84d5c6c84797a90c386f081d061ef72671
Myles Watson [Thu, 4 Mar 2021 00:31:17 +0000 (00:31 +0000)]
smp: Use SMP_TRACE_WARNING am:
4567823871 am:
3d5118b2ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13758553
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibd31c210968f8f4809dad8339fbb45585d23548f
Myles Watson [Wed, 3 Mar 2021 23:55:52 +0000 (23:55 +0000)]
smp: Use SMP_TRACE_WARNING am:
4567823871
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13758553
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2dab9afcd509f6f5082f69965c065a881e0bb64a
Myles Watson [Wed, 3 Mar 2021 22:04:25 +0000 (22:04 +0000)]
smp: Reject pairing if the public keys match am:
b7e176df4b am:
384a93f2b5 am:
d7649413ad am:
d501a765c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13522371
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I90d0c738c0d2afc39c79b2cf9d964bd10fbe0db7
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
Myles Watson [Wed, 3 Mar 2021 20:53:19 +0000 (20:53 +0000)]
smp: Reject pairing if the public keys match am:
b7e176df4b am:
384a93f2b5 am:
d7649413ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13522371
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifd61aee4801775b302e5e5eade5c7010228b8566
Myles Watson [Wed, 3 Mar 2021 20:15:44 +0000 (20:15 +0000)]
smp: Reject pairing if the public keys match am:
b7e176df4b am:
384a93f2b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13522371
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6945ff206f775739e76ee63b66bfe9acdd0c2c9a