OSDN Git Service
TreeHugger Robot [Wed, 3 Mar 2021 03:03:55 +0000 (03:03 +0000)]
Merge "btif: Return after closing the socket" into qt-dev am:
f77ee94322 am:
656e98853c am:
bc52d62a13
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13486155
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I937b10f34f2d9f982d6f950f09f9840172188ee2
TreeHugger Robot [Wed, 3 Mar 2021 02:16:18 +0000 (02:16 +0000)]
Merge "btif: Return after closing the socket" into qt-dev am:
f77ee94322 am:
656e98853c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13486155
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4551137fac7bff57f27bbdf210d329b058022ea2
TreeHugger Robot [Wed, 3 Mar 2021 01:34:32 +0000 (01:34 +0000)]
Merge "btif: Return after closing the socket" into qt-dev am:
f77ee94322
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13486155
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6f1e224a54b4c8b4ea5618d307e8cad56c64bca
TreeHugger Robot [Wed, 3 Mar 2021 00:51:13 +0000 (00:51 +0000)]
Merge "btif: Return after closing the socket" into qt-dev
Myles Watson [Thu, 4 Feb 2021 20:54:28 +0000 (12:54 -0800)]
btif: Return after closing the socket
Bug:
175686168
Test: poc in bug
Tag: #security
Change-Id: I3af19be9bee9535e67e4dcbc2584d2084656b817
Merged-In: I3af19be9bee9535e67e4dcbc2584d2084656b817
Myles Watson [Wed, 3 Feb 2021 21:44:26 +0000 (21:44 +0000)]
Merge "avrc_copy_packet: Zero initialize packet" into oc-mr1-dev am:
63480b1eee am:
131b92ac3f am:
6e271b0519 am:
8b3ad63b70 am:
3e928d15e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13287217
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6d5a4eaf88139a8f42fc2a78103d58200490a0e8
Myles Watson [Wed, 3 Feb 2021 21:00:11 +0000 (21:00 +0000)]
Merge "avrc_copy_packet: Zero initialize packet" into oc-mr1-dev am:
63480b1eee am:
131b92ac3f am:
6e271b0519 am:
8b3ad63b70
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13287217
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I71330bdcfe131e813c2ff56b9342adad2f72a059
Myles Watson [Wed, 3 Feb 2021 20:15:56 +0000 (20:15 +0000)]
Merge "avrc_copy_packet: Zero initialize packet" into oc-mr1-dev am:
63480b1eee am:
131b92ac3f am:
6e271b0519
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13287217
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3d2d3d2d29c497982f7a038c2779c03b2a1b486b
Myles Watson [Wed, 3 Feb 2021 19:41:39 +0000 (19:41 +0000)]
Merge "avrc_copy_packet: Zero initialize packet" into oc-mr1-dev am:
63480b1eee am:
131b92ac3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13287217
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If58ff39a1a996cf7f897204e5f2585589bbd4708
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
Myles Watson [Wed, 3 Feb 2021 18:30:15 +0000 (18:30 +0000)]
Merge "avrc_copy_packet: Zero initialize packet" into oc-mr1-dev
TreeHugger Robot [Fri, 15 Jan 2021 19:46:22 +0000 (19:46 +0000)]
[automerger skipped] Merge "AVRCP: Use calloc to zero reserved fields" into pi-dev am:
52c06e73c1 -s ours am:
13b0bc08af -s ours am:
d515359e8b -s ours am:
4789bf9257 -s ours
am skip reason: Change-Id I7a30edacf8377a9feecbb988b099d60d69b46f87 with SHA-1
8d461a866a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13298159
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I870529f996f6e56b31f9897ff10fff8034ad00d6
TreeHugger Robot [Fri, 15 Jan 2021 19:07:36 +0000 (19:07 +0000)]
[automerger skipped] Merge "AVRCP: Use calloc to zero reserved fields" into pi-dev am:
52c06e73c1 -s ours am:
13b0bc08af -s ours am:
d515359e8b -s ours
am skip reason: Change-Id I7a30edacf8377a9feecbb988b099d60d69b46f87 with SHA-1
8d461a866a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13298159
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9619f3b38abf5f1ac3f022c3c1121432e0f0cc73
TreeHugger Robot [Fri, 15 Jan 2021 18:44:12 +0000 (18:44 +0000)]
[automerger skipped] Merge "AVRCP: Use calloc to zero reserved fields" into pi-dev am:
52c06e73c1 -s ours am:
13b0bc08af -s ours
am skip reason: Change-Id I7a30edacf8377a9feecbb988b099d60d69b46f87 with SHA-1
8d461a866a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13298159
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I07d5afb629289c09c5f6d81eebad4de607bd08c0
TreeHugger Robot [Fri, 15 Jan 2021 18:00:26 +0000 (18:00 +0000)]
[automerger skipped] Merge "AVRCP: Use calloc to zero reserved fields" into pi-dev am:
52c06e73c1 -s ours
am skip reason: Change-Id I7a30edacf8377a9feecbb988b099d60d69b46f87 with SHA-1
8d461a866a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13298159
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie23077a7193bc0dd9be6138fa26211949e2253f8
TreeHugger Robot [Fri, 15 Jan 2021 17:20:28 +0000 (17:20 +0000)]
Merge "AVRCP: Use calloc to zero reserved fields" into pi-dev
TreeHugger Robot [Thu, 7 Jan 2021 18:48:34 +0000 (18:48 +0000)]
Merge "Legacy pairing: Reject device with same BD_ADDR" into oc-mr1-dev am:
93346eae3a am:
522313bb33 am:
2bd6cbf058 am:
3981ced364 am:
1aa74d4478
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13180128
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I97407380a12cdea95a59df5a3913bb189e34541e
TreeHugger Robot [Thu, 7 Jan 2021 18:48:28 +0000 (18:48 +0000)]
Merge "SDP: Only start discovery once" into oc-mr1-dev am:
a472b9b2b4 am:
76b56c906b am:
dcace8eb22 am:
aaca436d01 am:
2822d2f843
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13202007
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I63098b126a889297f78733f05842bb8b96ad65d5
Myles Watson [Thu, 7 Jan 2021 18:48:10 +0000 (18:48 +0000)]
[automerger skipped] AVRCP: Use calloc to zero reserved fields am:
8d461a866a -s ours am:
581a008f10 am:
47d7a7842a am:
f1d9dbdb30 am:
a491563392
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13204458
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I128905fcaf5c745e9b20caa9112307688e62a7c1
TreeHugger Robot [Thu, 7 Jan 2021 18:31:31 +0000 (18:31 +0000)]
Merge "Legacy pairing: Reject device with same BD_ADDR" into oc-mr1-dev am:
93346eae3a am:
522313bb33 am:
2bd6cbf058 am:
3981ced364
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13180128
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7bd582ed5e63d01c027ffae0562e2faa5d35a5b3
TreeHugger Robot [Thu, 7 Jan 2021 18:31:23 +0000 (18:31 +0000)]
Merge "SDP: Only start discovery once" into oc-mr1-dev am:
a472b9b2b4 am:
76b56c906b am:
dcace8eb22 am:
aaca436d01
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13202007
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0a68ba852f11441ae4df393f935512d33a461d94
Myles Watson [Thu, 7 Jan 2021 18:31:11 +0000 (18:31 +0000)]
[automerger skipped] AVRCP: Use calloc to zero reserved fields am:
8d461a866a -s ours am:
581a008f10 am:
47d7a7842a am:
f1d9dbdb30
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13204458
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie228f745b5ac42647b9c281c30f448b42f674252
TreeHugger Robot [Thu, 7 Jan 2021 17:52:27 +0000 (17:52 +0000)]
Merge "Legacy pairing: Reject device with same BD_ADDR" into oc-mr1-dev am:
93346eae3a am:
522313bb33 am:
2bd6cbf058
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13180128
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If134f91b4a058be7abc5f4a49db1ec99540a2ea5
TreeHugger Robot [Thu, 7 Jan 2021 17:52:23 +0000 (17:52 +0000)]
Merge "SDP: Only start discovery once" into oc-mr1-dev am:
a472b9b2b4 am:
76b56c906b am:
dcace8eb22
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13202007
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id9d0f0222b0c7bed033f41a1b48849ae5bc01ac3
Myles Watson [Thu, 7 Jan 2021 17:52:13 +0000 (17:52 +0000)]
[automerger skipped] AVRCP: Use calloc to zero reserved fields am:
8d461a866a -s ours am:
581a008f10 am:
47d7a7842a
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13204458
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I97eb38a9f11c97074dd4cce304c276138c66208f
TreeHugger Robot [Thu, 7 Jan 2021 17:35:10 +0000 (17:35 +0000)]
Merge "Legacy pairing: Reject device with same BD_ADDR" into oc-mr1-dev am:
93346eae3a am:
522313bb33
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13180128
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8f8757a8d5049f25b5bade4b5952654ed2317acd
TreeHugger Robot [Thu, 7 Jan 2021 17:35:04 +0000 (17:35 +0000)]
Merge "SDP: Only start discovery once" into oc-mr1-dev am:
a472b9b2b4 am:
76b56c906b
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13202007
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If2b43895ad5be40059b9a81bf257906a958c40da
Myles Watson [Thu, 7 Jan 2021 17:34:53 +0000 (17:34 +0000)]
[automerger skipped] AVRCP: Use calloc to zero reserved fields am:
8d461a866a -s ours am:
581a008f10
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13204458
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib996cf0eaacc56daaff94a0e80d44e1d5191dbba
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
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
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
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)
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
TreeHugger Robot [Wed, 6 Jan 2021 22:27:31 +0000 (22:27 +0000)]
Merge "SDP: Only start discovery once" into oc-mr1-dev
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)
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
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
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
Jeffrey Huang [Tue, 24 Nov 2020 23:04:00 +0000 (15:04 -0800)]
Migrate bluetooth imports to proto_logging
These enums are being migrated to proto_logging to decouple atoms.proto from statsd.
Ignore-AOSP-First: Requires other internal build rule changes. This
change will be cherry-picked to aosp afterwards.
Bug:
167962588
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I034d91894564010862b3bd0a4035e3e532a814b1
Merged-In: I034d91894564010862b3bd0a4035e3e532a814b1
TreeHugger Robot [Fri, 6 Nov 2020 08:37:36 +0000 (08:37 +0000)]
[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-dev am:
59304cd9d9 am:
16814b34fb -s ours am:
27feab80ac -s ours am:
8679ae4002 -s ours am:
e089c72645 -s ours am:
206766da1a -s ours am:
f11b9ed328 -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: I21b039091df6d90594c69117c8704eb6fd61d306
TreeHugger Robot [Fri, 6 Nov 2020 08:04:51 +0000 (08:04 +0000)]
[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-dev am:
59304cd9d9 am:
16814b34fb -s ours am:
27feab80ac -s ours am:
8679ae4002 -s ours am:
e089c72645 -s ours am:
206766da1a -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: I47164d343b5e6e04ab8e26244efe2ece23027bd2
TreeHugger Robot [Fri, 6 Nov 2020 07:49:32 +0000 (07:49 +0000)]
[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-dev am:
59304cd9d9 am:
16814b34fb -s ours am:
27feab80ac -s ours am:
8679ae4002 -s ours am:
e089c72645 -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: I9c1ddf62a3f3be22331dc83f91a00e6d70a48016
TreeHugger Robot [Fri, 6 Nov 2020 07:32:10 +0000 (07:32 +0000)]
[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-dev am:
59304cd9d9 am:
16814b34fb -s ours am:
27feab80ac -s ours am:
8679ae4002 -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: I8994cd9454395c1ef7e7cd387c342f81e4a7f06e
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
TreeHugger Robot [Fri, 6 Nov 2020 06:56:37 +0000 (06:56 +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:
10a497b5fd -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: I2e748d1d0950b9035ef76766d0bbc569b870f2c7
TreeHugger Robot [Fri, 6 Nov 2020 06:56:31 +0000 (06:56 +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:
9c13c8a937 -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: Idee884deddc4fd59788ef81f0f7892d1902348ef
TreeHugger Robot [Fri, 6 Nov 2020 06:56:25 +0000 (06:56 +0000)]
[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into qt-dev am:
94c5c10cdd -s ours am:
41f3b19e7e -s ours am:
41ec7d3c8f -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: I25225d38efa154632f3088aa37f44fc11424ccba
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
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 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: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: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:21 +0000 (06:20 +0000)]
Merge "Fix potential OOB write in libbluetooth" into qt-qpr1-dev am:
c1d503c7ed am:
a6b64b0542
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12778871
Change-Id: I7fbf5ba3e4c50185ff22e82353f33632de4539ef
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:16 +0000 (06:20 +0000)]
Merge "Fix potential OOB write in libbluetooth" into rvc-dev am:
5473887e4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12778870
Change-Id: Id178c883b9fb06614e52aa251e00406867981042
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: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
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 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:59 +0000 (05:51 +0000)]
Merge "Fix potential OOB write in libbluetooth" into qt-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 oc-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 03:04:36 +0000 (03:04 +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:
a7cc592bf4 -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: If8970d72c69318cd6bb198649f2d2b81125c83f4
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:13:19 +0000 (02:13 +0000)]
ACL: Drop broadcasts am:
83c32e8e8c am:
f4ae956619 am:
7b8e29fe9d am:
00c02016b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12951249
Change-Id: Ic029ad3eb6bae74f97c025ee5d4da4d6dfe8df24
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 [Fri, 23 Oct 2020 03:44:01 +0000 (03:44 +0000)]
[automerger skipped] Check a2dp packet length is zero am:
1e7e2e2f3f -s ours am:
2cbcd49680 -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: Iaf914acc4484071b44f98b68cfb7a982b42a6930
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 [Mon, 19 Oct 2020 17:34:07 +0000 (17:34 +0000)]
Cuttlefish: Log an error and close on !isOk() am:
0e7b41ca10
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12863315
Change-Id: Ib0e27222793cfaaf697f855eaf7df1a836b7fa81
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 21:09:47 +0000 (21:09 +0000)]
Fix a security issue in sdp_server.cc am:
d7573f4fa9 am:
97abd549aa am:
5d2163956a am:
484161c4d9 am:
ebf0b367db am:
47c9035c55 am:
1f892f8f59
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12776129
Change-Id: Ibaf3a92f49e4452edadbe44780b90578d0a0446e
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
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 23:20:24 +0000 (23:20 +0000)]
Check Classic key before cross-key derivation am:
814160abca am:
6cddc6cd87 am:
98e0ae0ef9 am:
7337996317 am:
fa1724a501 am:
502d60e1e4 am:
75f78efd2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12736109
Change-Id: I619e801f748be3ff8c90fb2ddf71fb1ef44f2e64
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