OSDN Git Service
TreeHugger Robot [Fri, 6 Nov 2020 06:23:52 +0000 (06:23 +0000)]
[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-mr1-dev am:
e1aed6e373 -s ours am:
0a7502bb9a -s ours am:
1d2eb5ae02 -s ours am:
260c2e875c -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: I73acbccc3118e746bc504e51c7a7fe77a9b9577e
TreeHugger Robot [Fri, 6 Nov 2020 06:23:47 +0000 (06:23 +0000)]
[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into pi-dev am:
a3296c0750 -s ours am:
9b8b7e7f27 -s ours am:
7c360fe435 -s ours
am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1
26d2f1d06a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12778873
Change-Id: I1dd6c468f6f0ed1b1b88f84efd85dbc661883e69
TreeHugger Robot [Fri, 6 Nov 2020 06:23:47 +0000 (06:23 +0000)]
[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-mr1-dev am:
e1aed6e373 -s ours am:
0a7502bb9a -s ours am:
1d2eb5ae02 -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: I41149474683ad9a985b7531c42e4637304e196f5
TreeHugger Robot [Fri, 6 Nov 2020 06:23:41 +0000 (06:23 +0000)]
[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into pi-dev am:
a3296c0750 -s ours am:
9b8b7e7f27 -s ours
am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1
26d2f1d06a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12778873
Change-Id: Iecc69a32a35925ee95eac84494aa40be2fdb72ab
TreeHugger Robot [Fri, 6 Nov 2020 06:23:34 +0000 (06:23 +0000)]
[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into qt-dev am:
94c5c10cdd -s ours am:
41f3b19e7e -s ours
am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1
3a41065d41 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12778872
Change-Id: Ib1b9b24598837206aefbb6013a8d5df08d290163
TreeHugger Robot [Fri, 6 Nov 2020 06:20:17 +0000 (06:20 +0000)]
[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-mr1-dev am:
e1aed6e373 -s ours am:
0a7502bb9a -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: I0c52de9f785ac2cb9a703adfcc8f19c68b635f69
TreeHugger Robot [Fri, 6 Nov 2020 06:20:08 +0000 (06:20 +0000)]
[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into pi-dev am:
a3296c0750 -s ours
am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1
26d2f1d06a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12778873
Change-Id: I59247f8bdb3119e33990038381ac68a85766dd6f
TreeHugger Robot [Fri, 6 Nov 2020 06:19:55 +0000 (06:19 +0000)]
[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into qt-dev am:
94c5c10cdd -s ours
am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1
3a41065d41 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12778872
Change-Id: Ifc1fb0c42cf9bfed5a25154f43960017441b8685
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
TreeHugger Robot [Fri, 6 Nov 2020 06:19:39 +0000 (06:19 +0000)]
Merge "Fix potential OOB write in libbluetooth" into qt-qpr1-dev am:
c1d503c7ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12778871
Change-Id: I50e8f23b513d444cca991fd5041c1047503b26c1
TreeHugger Robot [Fri, 6 Nov 2020 05:51:59 +0000 (05:51 +0000)]
Merge "Fix potential OOB write in libbluetooth" into qt-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
TreeHugger Robot [Fri, 6 Nov 2020 05:51:59 +0000 (05:51 +0000)]
Merge "Fix potential OOB write in libbluetooth" into rvc-dev
TreeHugger Robot [Fri, 6 Nov 2020 05:51:58 +0000 (05:51 +0000)]
Merge "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 qt-qpr1-dev
Myles Watson [Fri, 6 Nov 2020 02:51:27 +0000 (02:51 +0000)]
[automerger skipped] ACL: Drop broadcasts am:
f91dbe2985 am:
10cfa5e827 am:
e21d07e16e -s ours am:
de31f09430 -s ours am:
776ffab7af -s ours am:
7312df48e5 -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: I42bb4bab2a66fae379131e2ced2c91c05ace268c
Myles Watson [Fri, 6 Nov 2020 02:30:04 +0000 (02:30 +0000)]
[automerger skipped] ACL: Drop broadcasts am:
f91dbe2985 am:
10cfa5e827 am:
e21d07e16e -s ours am:
de31f09430 -s ours am:
776ffab7af -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: If3b119f99604729ba276271b28dee89e540d75a7
Myles Watson [Fri, 6 Nov 2020 02:12:38 +0000 (02:12 +0000)]
[automerger skipped] ACL: Drop broadcasts am:
f91dbe2985 am:
10cfa5e827 am:
e21d07e16e -s ours am:
de31f09430 -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: I53768da66285cc776fb47931964282ed6211b1b1
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
Myles Watson [Fri, 6 Nov 2020 01:18:17 +0000 (01:18 +0000)]
ACL: Drop broadcasts am:
83c32e8e8c am:
f4ae956619 am:
7b8e29fe9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12951249
Change-Id: I677f8f139118e2b6f7128a41dbb8f8c548ab2433
Myles Watson [Fri, 6 Nov 2020 01:05:39 +0000 (01:05 +0000)]
ACL: Drop broadcasts am:
83c32e8e8c am:
f4ae956619
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12951249
Change-Id: I664996c28ee502bae3b5dba0d97f45e6f5e244bc
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
Myles Watson [Fri, 6 Nov 2020 00:51:32 +0000 (00:51 +0000)]
ACL: Drop broadcasts am:
83c32e8e8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12951249
Change-Id: Ib7004546cc8e6dc05b13ca1a009e3c43eeb910b9
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
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
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
Chris Manton [Thu, 22 Oct 2020 23:28:07 +0000 (23:28 +0000)]
[automerger skipped] Check a2dp packet length is zero am:
1e7e2e2f3f -s ours
am skip reason: Change-Id I105b445293c02cb4f37c759fd5b05758fd4e3646 with SHA-1
d61cf5fe04 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12893689
Change-Id: Iee3994fd52bf4736845b8c0501ae70074a095d01
Chris Manton [Tue, 10 Mar 2020 15:59:02 +0000 (08:59 -0700)]
Check a2dp packet length is zero
Bug:
142546668
Bug:
168254957
Test: net_test_stack_a2dp_native
Change-Id: I105b445293c02cb4f37c759fd5b05758fd4e3646
Merged-In: I105b445293c02cb4f37c759fd5b05758fd4e3646
Myles Watson [Thu, 15 Oct 2020 23:16:21 +0000 (16:16 -0700)]
Cuttlefish: Log an error and close on !isOk()
Bug:
170189916
Test: device health tests
Change-Id: I784dfcb7fe9f92158406531582029770bc55679e
Hansong Zhang [Thu, 8 Oct 2020 20:34:10 +0000 (20:34 +0000)]
Fix a security issue in sdp_server.cc am:
d7573f4fa9 am:
97abd549aa am:
5d2163956a am:
484161c4d9 am:
ebf0b367db am:
47c9035c55
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12776129
Change-Id: Ifbfec91d9b448044b301ce4b6cc0a0241a843116
Hansong Zhang [Thu, 8 Oct 2020 20:21:36 +0000 (20:21 +0000)]
Fix a security issue in sdp_server.cc am:
d7573f4fa9 am:
97abd549aa am:
5d2163956a am:
484161c4d9 am:
ebf0b367db
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12776129
Change-Id: Icf998397b53883a7c25fc94fcc1d08c69af01766
Hansong Zhang [Thu, 8 Oct 2020 19:53:48 +0000 (19:53 +0000)]
Fix a security issue in sdp_server.cc am:
d7573f4fa9 am:
97abd549aa am:
5d2163956a am:
484161c4d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12776129
Change-Id: I5af578102b0479225c0d192eee47717a49d4646b
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
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
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
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
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
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
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
Merfed-In: I90834b920d61bfb2df9414a25d73ba40033e4748
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
Chen Chen [Tue, 6 Oct 2020 22:13:45 +0000 (22:13 +0000)]
Check Classic key before cross-key derivation am:
814160abca am:
6cddc6cd87 am:
98e0ae0ef9 am:
7337996317 am:
fa1724a501 am:
502d60e1e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736109
Change-Id: I1ed229afa0015de7ac4af6d417ec64fc1a74121e
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
Chen Chen [Tue, 6 Oct 2020 21:45:27 +0000 (21:45 +0000)]
Check Classic key before cross-key derivation am:
814160abca am:
6cddc6cd87 am:
98e0ae0ef9 am:
7337996317 am:
fa1724a501
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736109
Change-Id: I6ccef29a5b8bbe61ad33317c1ff0add3e8f7927e
Chen Chen [Tue, 6 Oct 2020 20:53:43 +0000 (20:53 +0000)]
Check Classic key before cross-key derivation am:
814160abca am:
6cddc6cd87 am:
98e0ae0ef9 am:
7337996317
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736109
Change-Id: Iaa69ebded8be2055cb9fee48d2d0b2e3ec8365cf
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
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
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
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
TreeHugger Robot [Tue, 6 Oct 2020 08:51:28 +0000 (08:51 +0000)]
Merge "Check Classic key before cross-key derivation" into qt-qpr1-dev am:
285caebef7
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687759
Change-Id: If5f3d6fc4f8b7f93144459e45ca8588cf47cf1fa
TreeHugger Robot [Tue, 6 Oct 2020 08:34:08 +0000 (08:34 +0000)]
Merge "Check Classic key before cross-key derivation" into qt-qpr1-dev
Chen Chen [Tue, 6 Oct 2020 04:38:13 +0000 (04:38 +0000)]
Check Classic key before cross-key derivation am:
992e25e6b9 am:
eec1a1e896 am:
212d730545 am:
6884783558
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736893
Change-Id: Ic22e35a189b734585ab561aeb0ce8d263297ba42
Chen Chen [Tue, 6 Oct 2020 04:38:04 +0000 (04:38 +0000)]
Check Classic key before cross-key derivation am:
da8aa68903 am:
85a7c65c28 am:
9407e4f700
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687761
Change-Id: Id279e08fa997f4c7eb748c2aeaf410f31e8860c5
Chen Chen [Tue, 6 Oct 2020 04:37:51 +0000 (04:37 +0000)]
Check Classic key before cross-key derivation am:
d3521aa04a am:
364407c8d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687760
Change-Id: I3df576be2b48b49834814309fa495ec6a975f460
Chen Chen [Tue, 6 Oct 2020 04:20:30 +0000 (04:20 +0000)]
Check Classic key before cross-key derivation am:
992e25e6b9 am:
eec1a1e896 am:
212d730545
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736893
Change-Id: Ia482be10c8ac7372a4d36c557e740a83231b10ae
Chen Chen [Tue, 6 Oct 2020 04:20:24 +0000 (04:20 +0000)]
Check Classic key before cross-key derivation am:
da8aa68903 am:
85a7c65c28
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687761
Change-Id: I494f299169e329ece034da105c83e392a13dc875
Chen Chen [Tue, 6 Oct 2020 04:20:18 +0000 (04:20 +0000)]
Check Classic key before cross-key derivation am:
d3521aa04a
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687760
Change-Id: I93f154a331ecfdee704321bd3e94758c18005658
Chen Chen [Tue, 6 Oct 2020 03:59:41 +0000 (03:59 +0000)]
Check Classic key before cross-key derivation am:
992e25e6b9 am:
eec1a1e896
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736893
Change-Id: Icfc2e05b44e48cc1ee6dd4594877a85195ea15f0
Chen Chen [Tue, 6 Oct 2020 03:59:33 +0000 (03:59 +0000)]
Check Classic key before cross-key derivation am:
da8aa68903
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12687761
Change-Id: I85a19b10f4f7ac9ec94811d022ed28b2e9a2b848
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
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
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
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
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
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
Jakub Pawlowski [Tue, 22 Sep 2020 21:14:20 +0000 (21:14 +0000)]
Merge "fix oob in avrc_ctrl_pars_vendor_cmd" into rvc-dev
TreeHugger Robot [Tue, 22 Sep 2020 00:07:05 +0000 (00:07 +0000)]
Merge "HciHalRootCanalTest: Use ASSERT and retry reads" into rvc-dev
Myles Watson [Sat, 9 May 2020 13:38:57 +0000 (06:38 -0700)]
HciHalRootCanalTest: Use ASSERT and retry reads
Tag: #gd-refactor
Bug:
156148686
Test: atest bluetooth_test_gd
(while building Android)
Change-Id: I4a69e172eda911e24ecf7482cd88a724139ca29d
Merged-In: I4a69e172eda911e24ecf7482cd88a724139ca29d
Jakub Pawlowski [Fri, 18 Sep 2020 07:41:34 +0000 (09:41 +0200)]
fix oob in avrc_ctrl_pars_vendor_cmd
Bug:
168712245
Test: compilation
Tag: #security
Change-Id: I7d26f9817b0ec8ff9a177271ea45cc9dd6701472
TreeHugger Robot [Mon, 31 Aug 2020 18:34:35 +0000 (18:34 +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:
dd0f5d9ae0 -s ours am:
69733ee790 -s ours am:
3f5ff9e9cd -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: I9fbacb404e1bc38d72b8c51a5b4df8aeae6a0bc2
li-wei.cheng [Mon, 31 Aug 2020 18:34:27 +0000 (18:34 +0000)]
[automerger skipped] Return after removing sample LTK device am:
c6879c3fe5 am:
bf69312868 am:
74ebab6814 -s ours am:
1f118853c5 -s ours am:
084f56e0af -s ours am:
801e68f7cc -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: I6e751cfbe1fcc4bf5dd6c39957eb5f18e2a5d34d
Jakub Pawlowski [Mon, 31 Aug 2020 18:34:15 +0000 (18:34 +0000)]
[automerger skipped] Don't persist bonds using sample LTK am:
70411f0877 -s ours am:
f79ba4c65d am:
1c00e23d9f am:
e55b86fb06 am:
4cc53a75b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12484285
Change-Id: I217b6d338f07a6b92005d6ccaa4926aaa2138cce
TreeHugger Robot [Mon, 31 Aug 2020 18:19:19 +0000 (18:19 +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:
dd0f5d9ae0 -s ours am:
69733ee790 -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: I9f0c34b2921f62ab21320d59b8c72a28da4985f3
li-wei.cheng [Mon, 31 Aug 2020 18:19:13 +0000 (18:19 +0000)]
[automerger skipped] Return after removing sample LTK device am:
c6879c3fe5 am:
bf69312868 am:
74ebab6814 -s ours am:
1f118853c5 -s ours am:
084f56e0af -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: Ie7fc64be134a82ee481383d10825ec2c5faf40ab
Jakub Pawlowski [Mon, 31 Aug 2020 18:19:02 +0000 (18:19 +0000)]
[automerger skipped] Don't persist bonds using sample LTK am:
70411f0877 -s ours am:
f79ba4c65d am:
1c00e23d9f am:
e55b86fb06
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12484285
Change-Id: I3a2dc1de7d57b588a0f5ed3dd935f0cce2510150
TreeHugger Robot [Mon, 31 Aug 2020 18:02:24 +0000 (18:02 +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:
dd0f5d9ae0 -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: Ia2c0620d025a91e2ba4cf0cd4acd5326d71c8522
li-wei.cheng [Mon, 31 Aug 2020 18:02:16 +0000 (18:02 +0000)]
[automerger skipped] Return after removing sample LTK device am:
c6879c3fe5 am:
bf69312868 am:
74ebab6814 -s ours am:
1f118853c5 -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: I075047a75067503e98c3d2251b03cad2e5a6fefc
Jakub Pawlowski [Mon, 31 Aug 2020 18:02:07 +0000 (18:02 +0000)]
[automerger skipped] Don't persist bonds using sample LTK am:
70411f0877 -s ours am:
f79ba4c65d am:
1c00e23d9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12484285
Change-Id: I2b6213a807eedaa840a15813efed81ed17d81e6d
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
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
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
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
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
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
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
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
Rahul Sabnis [Fri, 28 Aug 2020 22:24:06 +0000 (22:24 +0000)]
[automerger skipped] Send a response to an smp security request depending on the callback event am:
1570e8de12 -s ours am:
184ce57aa4 -s ours am:
8d50d88252 -s ours am:
5dbd5b6053 -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: I0a961ebb872632c9855df288f7aacfb950a06be3
TreeHugger Robot [Fri, 28 Aug 2020 22:23:56 +0000 (22:23 +0000)]
[automerger skipped] Merge "Send a response to an smp security request depending on the callback event" into pi-dev am:
9b8d6f75f1 -s ours am:
b35e5e8b26 -s ours am:
8af3e32bc5 -s ours
am skip reason: Change-Id Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 with SHA-1
e45cec1547 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12448843
Change-Id: I05b6b4bcba7a0d827c782954d127ee17134a0ec0
TreeHugger Robot [Fri, 28 Aug 2020 22:23:46 +0000 (22:23 +0000)]
[automerger skipped] Merge "Send a response to an smp security request depending on the callback event" into qt-dev am:
e59e55074c -s ours am:
b799bed2d9 -s ours
am skip reason: Change-Id Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 with SHA-1
3601e50959 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12448439
Change-Id: I84cec82acb65e4efbee04200312f261a4d47a74d
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)
Rahul Sabnis [Fri, 28 Aug 2020 21:53:15 +0000 (21:53 +0000)]
[automerger skipped] Send a response to an smp security request depending on the callback event am:
1570e8de12 -s ours am:
184ce57aa4 -s ours am:
8d50d88252 -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: If25d0749484b9e5045d7c40286bfa66266a6e17d
TreeHugger Robot [Fri, 28 Aug 2020 21:53:04 +0000 (21:53 +0000)]
[automerger skipped] Merge "Send a response to an smp security request depending on the callback event" into pi-dev am:
9b8d6f75f1 -s ours am:
b35e5e8b26 -s ours
am skip reason: Change-Id Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 with SHA-1
e45cec1547 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12448843
Change-Id: I3dca11a1724fc2ed3642fb2f61b11f155f9e3575
Rahul Sabnis [Fri, 28 Aug 2020 21:47:20 +0000 (21:47 +0000)]
[automerger skipped] Send a response to an smp security request depending on the callback event am:
1570e8de12 -s ours am:
184ce57aa4 -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: I523d2a6ae2651c6f975fd84178c457525269c605
TreeHugger Robot [Fri, 28 Aug 2020 21:47:11 +0000 (21:47 +0000)]
[automerger skipped] Merge "Send a response to an smp security request depending on the callback event" into pi-dev am:
9b8d6f75f1 -s ours
am skip reason: Change-Id Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 with SHA-1
e45cec1547 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12448843
Change-Id: Id26dace44f06b48fe704f6bc4a507863f5785df9
TreeHugger Robot [Fri, 28 Aug 2020 21:46:29 +0000 (21:46 +0000)]
[automerger skipped] Merge "Send a response to an smp security request depending on the callback event" into qt-dev am:
e59e55074c -s ours
am skip reason: Change-Id Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 with SHA-1
5b960d3490 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12448439
Change-Id: I62f7ba5d588cdba13aa04691df9b6ab48140bd71
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
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
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
TreeHugger Robot [Fri, 28 Aug 2020 21:34:08 +0000 (21:34 +0000)]
Merge "Send a response to an smp security request depending on the callback event" into qt-dev
TreeHugger Robot [Fri, 28 Aug 2020 19:47:47 +0000 (19:47 +0000)]
[automerger skipped] Merge "Send a response to an smp security request depending on the callback event" into qt-qpr1-dev am:
b4e6bd6209 -s ours
am skip reason: Change-Id Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 with SHA-1
3601e50959 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12448438
Change-Id: I6d3cb886b3f7a831d80c6209e8f175b87981e79a
TreeHugger Robot [Fri, 28 Aug 2020 19:27:01 +0000 (19:27 +0000)]
Merge "Send a response to an smp security request depending on the callback event" into qt-qpr1-dev