OSDN Git Service
Ted Wang [Tue, 7 May 2019 22:14:26 +0000 (15:14 -0700)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041 am:
9683021f70 skipped:
d691b2dd00 am:
5c82fb9354
am:
ee88b904c5
Change-Id: I1aa9a18fd7e1ccdcc89227d732a7ab758d62ae18
Ted Wang [Tue, 7 May 2019 22:01:21 +0000 (15:01 -0700)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041 am:
9683021f70 skipped:
d691b2dd00
am:
5c82fb9354
Change-Id: Ia977c5381d95449adf2e20692c23dcd00c9b3fd9
Android Build Merger (Role) [Mon, 6 May 2019 05:57:02 +0000 (05:57 +0000)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041 am:
9683021f70 skipped:
d691b2dd00
Change-Id: I12681b184de3aaff511fcf29540b6cde73bc6ac2
Android Build Merger (Role) [Mon, 6 May 2019 05:56:59 +0000 (05:56 +0000)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041 am:
9683021f70
Change-Id: I91346a746ce3342fc02c6a8afa82ed1904b374d7
Android Build Merger (Role) [Mon, 6 May 2019 05:56:54 +0000 (05:56 +0000)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041
Change-Id: I8f91d03ebd8ce528acf076443400daed71b261aa
Android Build Merger (Role) [Mon, 6 May 2019 05:56:49 +0000 (05:56 +0000)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe
Change-Id: I854858463801fabb6b21bc6af67d794387c36b3e
Android Build Merger (Role) [Mon, 6 May 2019 05:56:45 +0000 (05:56 +0000)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe
Change-Id: I79d94e8ba10a1f8e5f1657eaab36eacab4c6d0fb
Ted Wang [Mon, 29 Apr 2019 02:11:04 +0000 (10:11 +0800)]
DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type
Add boundary check in sdpu_get_len_from_type to prevent potential OOB read.
Bug:
117105007
Test: Manul
Merged-In: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a
Change-Id: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a
Jakub Pawlowski [Mon, 8 Apr 2019 13:00:22 +0000 (06:00 -0700)]
[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK am:
292fcf8612 -s ours
am:
e8dea68f6a -s ours
am skip reason: change_id I52fd484d42bf87e96dbc9e6456090f231ed48111 with SHA1
c0fb2a25f9 is in history
Change-Id: If68cf83db0a7388146f4e28a8433f8bd4c402e72
Jakub Pawlowski [Mon, 8 Apr 2019 12:55:18 +0000 (05:55 -0700)]
[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK
am:
292fcf8612 -s ours
am skip reason: change_id I52fd484d42bf87e96dbc9e6456090f231ed48111 with SHA1
c0fb2a25f9 is in history
Change-Id: I923523630e1e8530f23f3720611582353ffecff4
Jakub Pawlowski [Mon, 11 Mar 2019 18:22:01 +0000 (19:22 +0100)]
DO NOT MERGE Don't persist bonds using sample LTK
Test: compilation, manual testing
Bug:
128843052
Merged-In: I52fd484d42bf87e96dbc9e6456090f231ed48111
Change-Id: I52fd484d42bf87e96dbc9e6456090f231ed48111
Jakub Pawlowski [Fri, 5 Apr 2019 23:23:05 +0000 (16:23 -0700)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68 am:
0fd5b5de7d am:
1dec8a9f3e skipped:
05e4e07328 am:
c07f304de8
am:
fc58eb3c8d
Change-Id: I346917706000054f0aee3bc3084f60e15b7a4f57
Jakub Pawlowski [Fri, 5 Apr 2019 21:27:01 +0000 (14:27 -0700)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68 am:
0fd5b5de7d am:
1dec8a9f3e skipped:
05e4e07328
am:
c07f304de8
Change-Id: I20eed1aeb29a3df15251033d02fd7d5d241a28dd
Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:30 +0000 (18:14 +0000)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68 am:
0fd5b5de7d am:
1dec8a9f3e skipped:
05e4e07328
Change-Id: Ia5e85f456ba202b1562b8f6fc2f3481f7a999691
Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:23 +0000 (18:14 +0000)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68 am:
0fd5b5de7d am:
1dec8a9f3e
Change-Id: I6d433ec513e6f04b8e117a08a9ce5bebdd42d8d4
Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:19 +0000 (18:14 +0000)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68 am:
0fd5b5de7d
Change-Id: Idf19ab0fdf1da993701a6b24d47fccc982f3e2ff
Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:16 +0000 (18:14 +0000)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68
Change-Id: I21c8af012049cbf87adc90f1e3e46f47baddbca5
Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:13 +0000 (18:14 +0000)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9
Change-Id: I2a44d852ccb88db0bf360ae094d240ca64e50a94
Jakub Pawlowski [Mon, 11 Mar 2019 18:22:01 +0000 (19:22 +0100)]
DO NOT MERGE Don't persist bonds using sample LTK
Test: compilation, manual testing
Bug:
128843052
Change-Id: I52fd484d42bf87e96dbc9e6456090f231ed48111
Jakub Pawlowski [Mon, 11 Mar 2019 18:22:01 +0000 (19:22 +0100)]
DO NOT MERGE Don't persist bonds using sample LTK
Test: compilation, manual testing
Bug:
128843052
Change-Id: I52fd484d42bf87e96dbc9e6456090f231ed48111
Jakub Pawlowski [Tue, 26 Mar 2019 23:14:42 +0000 (16:14 -0700)]
[automerger skipped] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
049bf4ec4e -s ours
am:
5237f6add3 -s ours
am skip reason: change_id Id4b6b4e765628397a79e6806f45c2cd27acebd5b with SHA1
027532b367 is in history
Change-Id: I56780086be9ba71ee573956d0991824db7ebba0f
Jakub Pawlowski [Tue, 26 Mar 2019 23:14:08 +0000 (16:14 -0700)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86 am:
b788f8394e am:
a46c2b03a2 skipped:
f0213c3937 am:
1ecc29885a
am:
262bb16a7e
Change-Id: Iebb2f610252f8cec64ea7003fd1955d30b7fcf79
Jakub Pawlowski [Tue, 26 Mar 2019 23:02:58 +0000 (16:02 -0700)]
[automerger skipped] DO NOT MERGE Drop Bluetooth connection with weak encryption key
am:
049bf4ec4e -s ours
am skip reason: change_id Id4b6b4e765628397a79e6806f45c2cd27acebd5b with SHA1
027532b367 is in history
Change-Id: I9f7f56c8620a99ce5f2a4bf0e33eb94cdac829a5
Jakub Pawlowski [Tue, 26 Mar 2019 22:10:24 +0000 (15:10 -0700)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86 am:
b788f8394e am:
a46c2b03a2 skipped:
f0213c3937
am:
1ecc29885a
Change-Id: I43f7d01e376f8260e1120d3a403c41f45eca5950
Jakub Pawlowski [Thu, 14 Feb 2019 11:44:06 +0000 (12:44 +0100)]
DO NOT MERGE Drop Bluetooth connection with weak encryption key
This patch requires Bluetooth chip to support HCI Read Encryption Key Size
command and will cause Bluetooth to crash if this command is not supported
on a device. Such device should not take this patch and should look for
alternative solution to drop Bluetooth connection with weak encryption key.
Bug:
124301137
Merged-In: Id4b6b4e765628397a79e6806f45c2cd27acebd5b
Change-Id: Id4b6b4e765628397a79e6806f45c2cd27acebd5b
Android Build Merger (Role) [Fri, 22 Mar 2019 18:30:05 +0000 (18:30 +0000)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86 am:
b788f8394e am:
a46c2b03a2 skipped:
f0213c3937
Change-Id: I028d493ce2aae117a28422b68df67dd424b28148
Android Build Merger (Role) [Fri, 22 Mar 2019 18:30:03 +0000 (18:30 +0000)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86 am:
b788f8394e am:
a46c2b03a2
Change-Id: I203993fecd15608d036b79ae9f1bcf1e6e5536b1
Android Build Merger (Role) [Fri, 22 Mar 2019 18:30:01 +0000 (18:30 +0000)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86 am:
b788f8394e
Change-Id: Iebe131904b01492285eaaeaf6408b76037b2643e
Android Build Merger (Role) [Fri, 22 Mar 2019 18:29:58 +0000 (18:29 +0000)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86
Change-Id: Ia0fb7cb6c331f4f30b4a2320fa52b66be425c74f
Android Build Merger (Role) [Fri, 22 Mar 2019 18:29:56 +0000 (18:29 +0000)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367
Change-Id: I4fb660ac5ca288993e6f0643929eb1b1def1040c
Jakub Pawlowski [Thu, 14 Feb 2019 11:44:06 +0000 (12:44 +0100)]
DO NOT MERGE Drop Bluetooth connection with weak encryption key
This patch requires Bluetooth chip to support HCI Read Encryption Key Size
command and will cause Bluetooth to crash if this command is not supported
on a device. Such device should not take this patch and should look for
alternative solution to drop Bluetooth connection with weak encryption key.
Bug:
124301137
Change-Id: Id4b6b4e765628397a79e6806f45c2cd27acebd5b
Jakub Pawlowski [Thu, 14 Feb 2019 11:44:06 +0000 (12:44 +0100)]
DO NOT MERGE Drop Bluetooth connection with weak encryption key
This patch requires Bluetooth chip to support HCI Read Encryption Key Size
command and will cause Bluetooth to crash if this command is not supported
on a device. Such device should not take this patch and should look for
alternative solution to drop Bluetooth connection with weak encryption key.
Bug:
124301137
Change-Id: Id4b6b4e765628397a79e6806f45c2cd27acebd5b
Hansong Zhang [Fri, 8 Mar 2019 00:09:35 +0000 (16:09 -0800)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178 am:
c97a452b7c am:
a2661852ce skipped:
3c413e34d2 am:
ec1eca1dfb
am:
294210a1a2
Change-Id: I770c49c0620e4267d2134abbecc8b55193149227
Hansong Zhang [Thu, 7 Mar 2019 23:22:20 +0000 (15:22 -0800)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178 am:
c97a452b7c am:
a2661852ce skipped:
3c413e34d2
am:
ec1eca1dfb
Change-Id: I8d891af970d9eea45384eff2967544adb6ffafc7
TreeHugger Robot [Thu, 7 Mar 2019 23:04:58 +0000 (23:04 +0000)]
Merge "DO NOT MERGE Fix length for L2CAP config type EXT FLOW" into nyc-dev
Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:47 +0000 (18:51 +0000)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178 am:
c97a452b7c am:
a2661852ce skipped:
3c413e34d2
Change-Id: I5f0ad541fa702233322b96e5dd5c9d53233dea94
Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:45 +0000 (18:51 +0000)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178 am:
c97a452b7c am:
a2661852ce
Change-Id: I6e56a6c02e5d7a3e23832c8e24550ae626a4dc6a
Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:43 +0000 (18:51 +0000)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178 am:
c97a452b7c
Change-Id: I747585195e3cf9137449dc777b64174a4a93c1f3
Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:42 +0000 (18:51 +0000)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178
Change-Id: Ie35b3f093063898bc9d8cab84d221194f1ca007b
Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:38 +0000 (18:51 +0000)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe
Change-Id: I24f0d31be7582e28ba9b96d836cd85bcf7f3ef4c
Hansong Zhang [Thu, 7 Mar 2019 18:50:04 +0000 (10:50 -0800)]
DO NOT MERGE Fix length for L2CAP config type EXT FLOW
Bug:
119870451
Test: POC
Change-Id: I11041dd03caad5569e930ff36b50fc9c2719c57f
Ugo Yu [Fri, 8 Feb 2019 20:38:28 +0000 (12:38 -0800)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
99495df519 -s ours
am:
8d550cccd6 -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1
f3681c8616 is in history
Change-Id: Iaf7c1aadcfd65ed6a82b0c3bc98ff121046f70d2
Ugo Yu [Fri, 8 Feb 2019 20:37:26 +0000 (12:37 -0800)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
0989441858 -s ours
am:
a6d6406255 -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1
f3681c8616 is in history
Change-Id: Ie5679c43d4e59f3028a115558763baae8d31ec73
Ugo Yu [Fri, 8 Feb 2019 20:34:11 +0000 (12:34 -0800)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev
am:
99495df519 -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1
0989441858 is in history
Change-Id: I6fb78cdd8f4c748d6cafa85bdb1f8f60d676373b
Ugo Yu [Fri, 8 Feb 2019 20:33:37 +0000 (12:33 -0800)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2)
am:
0989441858 -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1
edd7e731ed is in history
Change-Id: Ied8e02f8c14ed6190cc9baebf688359d682b6d00
TreeHugger Robot [Fri, 8 Feb 2019 20:19:42 +0000 (20:19 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev
Ugo Yu [Fri, 8 Feb 2019 08:10:13 +0000 (00:10 -0800)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into oc-dev am:
c59317a10a
am:
d73d5ace07
Change-Id: I276abc4b3d069c7700e37cf6c2a34df380b07035
Ugo Yu [Fri, 8 Feb 2019 08:06:25 +0000 (00:06 -0800)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into oc-dev
am:
c59317a10a
Change-Id: I424449c094db3c75d1f76f7d397b7b510d1a8959
TreeHugger Robot [Fri, 8 Feb 2019 07:54:10 +0000 (07:54 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into nyc-dev
TreeHugger Robot [Fri, 8 Feb 2019 07:54:10 +0000 (07:54 +0000)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910 am:
c29c3aa408 am:
70ab44a424
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910 am:
c29c3aa408
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed
DO NOT MERGE Separate SDP procedure from bonding state (1/2)
TreeHugger Robot [Fri, 8 Feb 2019 07:54:10 +0000 (07:54 +0000)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into cw-f-dev
* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910 am:
c29c3aa408
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed
DO NOT MERGE Separate SDP procedure from bonding state (1/2)
TreeHugger Robot [Fri, 8 Feb 2019 07:54:10 +0000 (07:54 +0000)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed
DO NOT MERGE Separate SDP procedure from bonding state (1/2)
TreeHugger Robot [Fri, 8 Feb 2019 07:54:10 +0000 (07:54 +0000)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed
DO NOT MERGE Separate SDP procedure from bonding state (1/2)
TreeHugger Robot [Fri, 8 Feb 2019 07:54:10 +0000 (07:54 +0000)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into oc-dev
* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910 am:
c29c3aa408 am:
70ab44a424 skipped:
4e26a1fa5d
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910 am:
c29c3aa408 am:
70ab44a424
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910 am:
c29c3aa408
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed
DO NOT MERGE Separate SDP procedure from bonding state (1/2)
Hansong Zhang [Fri, 8 Feb 2019 00:46:11 +0000 (16:46 -0800)]
Merge "btm_proc_smp_cback: Don't access p_dev_rec if freed" into oc-dev am:
4ac889b785
am:
c87e949d53
Change-Id: I6875480db5a714d721d20ead2111627f4ab5a68e
Hansong Zhang [Fri, 8 Feb 2019 00:42:12 +0000 (16:42 -0800)]
Merge "btm_proc_smp_cback: Don't access p_dev_rec if freed" into oc-dev
am:
4ac889b785
Change-Id: I3a99684487593468b89948aa9d3be99e5ed705f4
TreeHugger Robot [Fri, 8 Feb 2019 00:31:40 +0000 (00:31 +0000)]
Merge "btm_proc_smp_cback: Don't access p_dev_rec if freed" into oc-dev
TreeHugger Robot [Fri, 8 Feb 2019 00:27:55 +0000 (00:27 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev
Hansong Zhang [Thu, 7 Feb 2019 21:21:26 +0000 (13:21 -0800)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into oc-dev am:
e145805974
am:
9b0e9a32bb
Change-Id: I02f1344805f748024dc28e05fd0afe67a6afb61a
Hansong Zhang [Thu, 7 Feb 2019 21:17:35 +0000 (13:17 -0800)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into oc-dev
am:
e145805974
Change-Id: Iaa78778cedd6e04d3cf7d009b81a9599658e6583
TreeHugger Robot [Thu, 7 Feb 2019 21:07:56 +0000 (21:07 +0000)]
Merge "DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed" into nyc-dev
TreeHugger Robot [Thu, 7 Feb 2019 21:07:56 +0000 (21:07 +0000)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c am:
90265d4ee0
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce
DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed
TreeHugger Robot [Thu, 7 Feb 2019 21:07:56 +0000 (21:07 +0000)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into cw-f-dev
* changes:
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce
DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed
TreeHugger Robot [Thu, 7 Feb 2019 21:07:56 +0000 (21:07 +0000)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce
DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed
TreeHugger Robot [Thu, 7 Feb 2019 21:07:56 +0000 (21:07 +0000)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce
DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed
TreeHugger Robot [Thu, 7 Feb 2019 21:07:56 +0000 (21:07 +0000)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into oc-dev
* changes:
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c am:
90265d4ee0 skipped:
84ba34d57a
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c am:
90265d4ee0
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce
DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed
Hansong Zhang [Sat, 2 Feb 2019 08:09:09 +0000 (00:09 -0800)]
Merge changes from topic "am-
cdd47550-8877-443a-826f-
db2b25d750ce" into oc-dev am:
8ea254e227
am:
04f9bde9ea
Change-Id: I2f9ab4cc670a7faa7305fe110a964168bd4c40d5
Hansong Zhang [Sat, 2 Feb 2019 08:05:14 +0000 (00:05 -0800)]
Merge changes from topic "am-
cdd47550-8877-443a-826f-
db2b25d750ce" into oc-dev
am:
8ea254e227
Change-Id: Ifc5a20abe1c8091f4850cd3d75f9ecfb4474f11e
TreeHugger Robot [Sat, 2 Feb 2019 07:52:13 +0000 (07:52 +0000)]
Merge "DO NOT MERGE process_l2cap_cmd: Fix OOB" into nyc-dev
TreeHugger Robot [Sat, 2 Feb 2019 07:52:13 +0000 (07:52 +0000)]
Merge changes from topic "am-
cdd47550-8877-443a-826f-
db2b25d750ce" into oc-dev
* changes:
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93 am:
14f6578d9e am:
53e323b2af am:
d0584f3dcf skipped:
55b702e6c4
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93 am:
14f6578d9e am:
53e323b2af am:
d0584f3dcf
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93 am:
14f6578d9e am:
53e323b2af
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93 am:
14f6578d9e
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93
DO NOT MERGE process_l2cap_cmd: Fix OOB
Hansong Zhang [Fri, 1 Feb 2019 23:39:08 +0000 (15:39 -0800)]
Merge "process_l2cap_cmd: Fix OOB" into oc-dev am:
356edb4333
am:
82365b0e8d
Change-Id: I4f04fad60e84785f474390e473d2fcf19f66a044
Hansong Zhang [Fri, 1 Feb 2019 23:33:09 +0000 (15:33 -0800)]
Merge "process_l2cap_cmd: Fix OOB" into oc-dev
am:
356edb4333
Change-Id: I0e1800587513bdb39e0b6eff7e46254470ab2def
TreeHugger Robot [Fri, 1 Feb 2019 23:18:22 +0000 (23:18 +0000)]
Merge "process_l2cap_cmd: Fix OOB" into oc-dev
Hansong Zhang [Wed, 30 Jan 2019 00:56:34 +0000 (16:56 -0800)]
Merge "btm_ble_multi_adv: Check data length in HCI interface" into oc-dev am:
19460901d8
am:
154230b832
Change-Id: I69aba9f5350a2b4510e49494839bbff6369c8b4a
Hansong Zhang [Wed, 30 Jan 2019 00:49:16 +0000 (16:49 -0800)]
Merge "btm_ble_multi_adv: Check data length in HCI interface" into oc-dev
am:
19460901d8
Change-Id: If4f3b40817ff57bdae4777ae330854a9119ae0b7
TreeHugger Robot [Wed, 30 Jan 2019 00:25:28 +0000 (00:25 +0000)]
Merge "btm_ble_multi_adv: Check data length in HCI interface" into oc-dev
Android Build Merger (Role) [Tue, 22 Jan 2019 21:47:38 +0000 (21:47 +0000)]
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c am:
90265d4ee0 skipped:
84ba34d57a
Change-Id: I73f54778128ee9bf1ed46c55bbd545b29ed2dc54
Android Build Merger (Role) [Tue, 22 Jan 2019 21:47:36 +0000 (21:47 +0000)]
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c am:
90265d4ee0
Change-Id: I080739b77c52af5ff54bfc4e8a20cf8fd52b235b
Android Build Merger (Role) [Tue, 22 Jan 2019 21:47:35 +0000 (21:47 +0000)]
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c
Change-Id: Ic43337c91c1cdcb9eaea22311cd7205dc05dcfa2
Hansong Zhang [Thu, 10 Jan 2019 02:18:17 +0000 (18:18 -0800)]
btm_proc_smp_cback: Don't access p_dev_rec if freed
In btm_proc_smp_cback(), return after p_dev_rec is freed in the middle
to prevent use after free
Bug:
120612744
Test: Use ASAN build; connect to a LE device and wait for timeout
Change-Id: Ic9d0eaeb62a1a1b24884146ca82f4104fabc5bac
Android Build Merger (Role) [Tue, 22 Jan 2019 21:47:33 +0000 (21:47 +0000)]
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2
Change-Id: I96de72b97a23eebad116c98899f59f399614cff7
Android Build Merger (Role) [Tue, 22 Jan 2019 21:47:32 +0000 (21:47 +0000)]
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce
Change-Id: Iad8449f422afb55305d3f1f2a148a4122c49c7d8
Hansong Zhang [Tue, 22 Jan 2019 21:46:47 +0000 (13:46 -0800)]
DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed
In btm_proc_smp_cback(), return after p_dev_rec is freed in the middle
to prevent use after free
Bug:
120612744
Test: Use ASAN build; connect to a LE device and wait for timeout
Change-Id: I09aa1cf1d1c835146b62d0f4989aeedfb885d95b
Android Build Merger (Role) [Tue, 22 Jan 2019 18:47:24 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93 am:
14f6578d9e am:
53e323b2af am:
d0584f3dcf skipped:
55b702e6c4
Change-Id: If1fb97bc56d2ed652f56f1f962aea1d00843543e
Android Build Merger (Role) [Tue, 22 Jan 2019 18:47:22 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93 am:
14f6578d9e am:
53e323b2af am:
d0584f3dcf
Change-Id: I101a465864f054989085bba0ccf2fc633445f356
Android Build Merger (Role) [Tue, 22 Jan 2019 18:47:20 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93 am:
14f6578d9e am:
53e323b2af
Change-Id: I9a919a3168f0d37834a14778c3f24f1e5f417685
Android Build Merger (Role) [Tue, 22 Jan 2019 18:47:18 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93 am:
14f6578d9e
Change-Id: I1df2130c25d9399d2c6ebc47bc0b8ec127994b89
Android Build Merger (Role) [Tue, 22 Jan 2019 18:47:16 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93
Change-Id: I89bb716ce51a1d98147c0df527174b4934999347
Hansong Zhang [Fri, 18 Jan 2019 19:51:00 +0000 (11:51 -0800)]
DO NOT MERGE process_l2cap_cmd: Fix OOB
Bug:
119870451
Test: POC
Change-Id: Ieef322a3ad4cebcaf40e5388584d3a04a4761d2e
Hansong Zhang [Mon, 14 Jan 2019 22:59:35 +0000 (14:59 -0800)]
process_l2cap_cmd: Fix OOB
Bug:
119870451
Test: POC
Change-Id: I2f5e7fedd9aed96c4ffc55af79fdac61c2e5b087
Merged-In: I5131bbf9cda6248fdbbc4bb91916b2fe3731246e
Hansong Zhang [Wed, 16 Jan 2019 20:33:26 +0000 (12:33 -0800)]
btm_ble_multi_adv: Check data length in HCI interface
For BleAdvertiserVscHciInterfaceImpl and
BleAdvertiserLegacyHciInterfaceImpl, the maximum size of scan response
and advertising packet data length should be BTM_BLE_AD_DATA_LEN (31).
Bug:
121145627
Test: POC
Change-Id: I7653a6c186b7313ef2b1547bca120b9d41c90140
Stanley Tng [Mon, 7 Jan 2019 22:45:06 +0000 (14:45 -0800)]
[automerger skipped] Merge "DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu" into oc-dev am:
3fd73e4ad2 -s ours
am:
af8cf98776 -s ours
am skip reason: change_id I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a with SHA1
c1fcbd5508 is in history
Change-Id: Ib82a5c8869f17e93969906a55323e43a79628f4a
Stanley Tng [Mon, 7 Jan 2019 22:44:41 +0000 (14:44 -0800)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31 am:
097ecf3d88 am:
2ebe3d52b0 skipped:
dff13d810c am:
47dcb6a458
am:
a2e761ac2b
Change-Id: Ia655d085c410e45e44efc1fa1bb2737a7cccd310
Stanley Tng [Mon, 7 Jan 2019 22:40:43 +0000 (14:40 -0800)]
[automerger skipped] Merge "DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu" into oc-dev
am:
3fd73e4ad2 -s ours
am skip reason: change_id I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a with SHA1
c1fcbd5508 is in history
Change-Id: Ie17711d48b90d8921cf26dc501cdfb776c7ef47e
Stanley Tng [Mon, 7 Jan 2019 22:40:22 +0000 (14:40 -0800)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31 am:
097ecf3d88 am:
2ebe3d52b0 skipped:
dff13d810c
am:
47dcb6a458
Change-Id: Ief422a38b0c559b912038c038edc48854357b3bf
TreeHugger Robot [Mon, 7 Jan 2019 22:33:36 +0000 (22:33 +0000)]
Merge "DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu" into oc-dev
Stanley Tng [Tue, 11 Dec 2018 22:45:13 +0000 (14:45 -0800)]
DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu
Add check to make sure that data buffer is big enough to read the 2
bytes for length.
Also, fix a regression from the previous CL that checks the buffer length
before doing a memcpy. The previous check is too strict causing valid
sized buffers to be rejected. The length check is incorrect and off by the header size.
Bug:
120665616
Test: Run the SL4A Test for LE CoC, BleCoCTest
Merged-In: I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a
Change-Id: I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a
(cherry picked from commit
fcb1994de1f6ee34b8dc6804a2b32e20bf138073)
(cherry picked from commit
1f1d8b97d80d25023c4c7b04d2aa18d367f4158d)
(cherry picked from commit
6b2739f309f7719086eb8201b3e1a35ba60035f4)
Android Build Merger (Role) [Sun, 6 Jan 2019 21:36:29 +0000 (21:36 +0000)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31 am:
097ecf3d88 am:
2ebe3d52b0 skipped:
dff13d810c
Change-Id: I92b4d78f5b6a53c863e7ec6d91b4cc32982258f8
Android Build Merger (Role) [Sun, 6 Jan 2019 21:36:28 +0000 (21:36 +0000)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31 am:
097ecf3d88 am:
2ebe3d52b0
Change-Id: I0cbec621cadfaaf9142d427b52a17cd9db3cd08a
Android Build Merger (Role) [Sun, 6 Jan 2019 21:36:27 +0000 (21:36 +0000)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31 am:
097ecf3d88
Change-Id: I9fd0733ff10442ca2050e440b954a9cb2f574c1a
OSDN Git Service
