OSDN Git Service
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 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 [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: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
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
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 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 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: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 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: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 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 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 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: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
Myles Watson [Wed, 3 Mar 2021 19:08:40 +0000 (19:08 +0000)]
smp: Reject pairing if the public keys match am:
b7e176df4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13522371
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If45c76319ea662f40ce02bc8ef9f8d6e2ce9d291
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 [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
Myles Watson [Fri, 5 Feb 2021 01:30:55 +0000 (17:30 -0800)]
avrcp: Ignore AVCT commands that are too long
Bug:
177611958
Test: compilation
Tag: #security
Change-Id: If914b5928cdf16696eb54bfe91c2869cbbf8e36c
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 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
Chienyuan [Thu, 28 Jan 2021 06:08:17 +0000 (14:08 +0800)]
DO NOT MERGE Add mutex for std::map in btif_av.cc
TAG: #security
Bug:
169252501
Test: compilation
Ignore-AOSP-First: security fix
Change-Id: I592c0a9c0e77869999357611aa99f3d9bc53b8b6
Chienyuan [Thu, 28 Jan 2021 06:08:17 +0000 (14:08 +0800)]
DO NOT MERGE Add mutex for std::map in btif_av.cc
TAG: #security
Bug:
169252501
Test: compilation
Ignore-AOSP-First: security fix
Change-Id: I592c0a9c0e77869999357611aa99f3d9bc53b8b6
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 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
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: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: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: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: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 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 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 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: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