OSDN Git Service
Android Build Merger (Role) [Wed, 30 May 2018 17:54:31 +0000 (17:54 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111 am:
a42a5d379f
Change-Id: I26448362b705378e5393f8a621a39db54c656580
Android Build Merger (Role) [Wed, 30 May 2018 17:54:30 +0000 (17:54 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111
Change-Id: Icd6b0ce2d5992e0ddc60146639c69cb092dc6bdf
Android Build Merger (Role) [Wed, 30 May 2018 17:54:27 +0000 (17:54 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975
Change-Id: I930a5cfd8ddecf3782b878d307aa576e47f49164
Android Build Merger (Role) [Wed, 30 May 2018 17:54:26 +0000 (17:54 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f
Change-Id: I7c1149eb4ace84dd30921e2d77b0e413540c1e98
Android Build Merger (Role) [Wed, 30 May 2018 17:54:24 +0000 (17:54 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938
Change-Id: I3fc3934d98a3d29f14f13246241ae2eff030972d
Myles Watson [Tue, 29 May 2018 23:55:58 +0000 (16:55 -0700)]
DO NOT MERGE: SDP: Recalculate param_len after max_list_len
Bug:
78136869
Test: manual connection to an A2DP device
Change-Id: I71392cf1a70567fec957feb36768069ac5258aa1
(cherry picked from commit
ef7dddabbd70222fa0fafc97e8562d977f550d26)
Android Build Merger (Role) [Sat, 26 May 2018 07:29:18 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11 am:
ed1ba213f3 am:
272ded19ed
Change-Id: If0a5e66c97c1acb07555cd20c0a4bbed62e40a9a
Android Build Merger (Role) [Sat, 26 May 2018 07:29:16 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11 am:
ed1ba213f3
Change-Id: I5a24b2d428c69771380e3d6484f9770a3c8cf33e
Android Build Merger (Role) [Sat, 26 May 2018 07:29:15 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11
Change-Id: I43e8c151fffa381413347fa2429b4a996f432199
Android Build Merger (Role) [Sat, 26 May 2018 07:29:14 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2
Change-Id: I3edb3cd03b07aa7dba92f6d90026dd1c1e8d3b6b
Android Build Merger (Role) [Sat, 26 May 2018 07:29:12 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055
Change-Id: I1d7cb68481b798a0f59b8b8bdf6639f5fb1c5fea
Jakub Pawlowski [Wed, 23 May 2018 17:30:19 +0000 (10:30 -0700)]
GATT: Handle too short Error Response PDU
Since the spec is not clear what to do in this case, use one of
reserved error codes as a failure reason, and pass it to upper layers.
Bug:
79591688
Change-Id: Ie6a53e9c8e4ceb8f1e5a75aee44baa5f4a798c4f
Merged-In: Ie6a53e9c8e4ceb8f1e5a75aee44baa5f4a798c4f
Android Build Merger (Role) [Sat, 26 May 2018 02:50:26 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8 am:
0f69ef1742 am:
1e0d3bafed
Change-Id: If52d04ab58a88e517a559d11d4f876a2ba56d70f
Android Build Merger (Role) [Sat, 26 May 2018 02:50:25 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8 am:
0f69ef1742
Change-Id: I274a46dd9edf3810f47daf791e1dc69c6ba0504b
Android Build Merger (Role) [Sat, 26 May 2018 02:50:23 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8
Change-Id: Ib296956f3e5ff59ed7f02d61dcc6bf93e572c58f
Android Build Merger (Role) [Sat, 26 May 2018 02:50:21 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d
Change-Id: Ib45cb979df156f9871bbe845dcd12d291681035e
Android Build Merger (Role) [Sat, 26 May 2018 02:50:19 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d
Change-Id: Ib457d90751151790f92abe23b38596c02f0a69af
Jakub Pawlowski [Thu, 24 May 2018 15:59:34 +0000 (08:59 -0700)]
Add PDU size checks in process_service_search_attr_rsp
Bug:
79884292
Change-Id: Icc02a6188f806f766aa8676804d74995afa08d25
Merged-In: Icc02a6188f806f766aa8676804d74995afa08d25
Ajay Panicker [Mon, 14 May 2018 18:27:44 +0000 (18:27 +0000)]
Merge changes from topic "am-
deb20f2a-d7e9-4660-922e-
16ad46b80c7a" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241
DO NOT MERGE: Check number of attributes before writing to a buffer
Ajay Panicker [Mon, 14 May 2018 18:27:44 +0000 (18:27 +0000)]
Merge "DO NOT MERGE: Check number of attributes before writing to a buffer" into nyc-dev
TreeHugger Robot [Fri, 11 May 2018 22:24:01 +0000 (22:24 +0000)]
Merge "DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE" into nyc-dev
Android Build Merger (Role) [Fri, 11 May 2018 18:58:05 +0000 (18:58 +0000)]
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241
Change-Id: Ic7688754333ee91513ef0fcd47594eb9e561b3dd
Ajay Panicker [Fri, 11 May 2018 18:47:31 +0000 (11:47 -0700)]
DO NOT MERGE: Check number of attributes before writing to a buffer
Bug:
73824150
Test: Compile
Change-Id: Ie38ba177d6599afe28b5c6684bd951a75fa8a805
Android Build Merger (Role) [Fri, 11 May 2018 18:41:06 +0000 (18:41 +0000)]
[automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am:
9ca8320100
Change-Id: Ic53f90a5ce4767355afaeb0852053120f28df135
Hansong Zhang [Fri, 11 May 2018 18:40:44 +0000 (11:40 -0700)]
DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE
Test: manual
Bug:
73782082
Change-Id: I4e384a2f8c0d8c4af03bd5865b2e907321419c86
android-build-team Robot [Thu, 3 May 2018 23:15:36 +0000 (23:15 +0000)]
Merge "DO NOT MERGE Prevent stack overflow in btif_storage" into nyc-dev
android-build-team Robot [Thu, 3 May 2018 23:15:36 +0000 (23:15 +0000)]
Merge changes from topic "am-
75dfedd1-e9af-4127-a4f2-
dca9a919845a-nyc-dev" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am:
1d200be958
DO NOT MERGE Prevent stack overflow in btif_storage
Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:38 +0000 (22:47 +0000)]
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am:
1d200be958
Change-Id: I22cc9734c1786d691702651f5799b74cab5678a6
Hansong Zhang [Thu, 26 Apr 2018 22:45:28 +0000 (15:45 -0700)]
DO NOT MERGE Prevent stack overflow in btif_storage
Bug:
73963551
Test: manual
Change-Id: I5f7a583aad150ebf9e3d492181d80ca935c8aa3f
Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:07 +0000 (22:47 +0000)]
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am:
560a6244ea am:
525aee59af am:
6a0ef37a82 skipped:
4dfb42893f am:
2503636b1e
Change-Id: I4ae296df5e8019bfb178c1c61d8eec2cac61200b
Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:05 +0000 (22:47 +0000)]
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am:
560a6244ea am:
525aee59af am:
6a0ef37a82 skipped:
4dfb42893f
Change-Id: Id44112648ab9ba78c64631ae2613e154a42f15a6
Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:03 +0000 (22:47 +0000)]
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am:
560a6244ea am:
525aee59af am:
6a0ef37a82
Change-Id: I718febf1f78b104c9e122a75dd9e5f94e53637a3
Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:01 +0000 (22:47 +0000)]
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am:
560a6244ea am:
525aee59af
Change-Id: Ib813cfc3cba01369c9ccada373d482544fd60c16
Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:00 +0000 (22:47 +0000)]
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am:
560a6244ea
Change-Id: I34d8e29615d621cdfadd2f452dd7fd67454929b7
Hansong Zhang [Thu, 26 Apr 2018 22:45:28 +0000 (15:45 -0700)]
DO NOT MERGE Prevent stack overflow in btif_storage
Bug:
73963551
Test: manual
Change-Id: I5f7a583aad150ebf9e3d492181d80ca935c8aa3f
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:59 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
94dd5564d8 am:
13113597ed am:
7d660ff9bf skipped:
f5be85f852 am:
b86ae24aef
Change-Id: I4894c6bd85e9e602b0f1fe34fcc06aa5a1b41388
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:58 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
94dd5564d8 am:
13113597ed am:
7d660ff9bf skipped:
f5be85f852
Change-Id: I09c7fbeb8ca3814d2c91aac744ca5c91fa8e34c4
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:57 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
94dd5564d8 am:
13113597ed am:
7d660ff9bf
Change-Id: I6a6369b2bac96ef4926969b5909e85026553aff8
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:56 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
94dd5564d8 am:
13113597ed
Change-Id: Ia7b054ec720067d2b84d8e10f768fa92eb802008
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:54 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
94dd5564d8
Change-Id: Ib7066a2e0075b02ba1d1400b559287e3eef08200
Andre Eisenbach [Wed, 4 Apr 2018 20:38:38 +0000 (13:38 -0700)]
DO NOT MERGE SMP: Validate remote elliptic curve points
Fixes:
72377774
Test: net_test_stack_smp (where applicable)
Change-Id: Iefcf97364493467075fadefd77d12716f71cd4f6
(cherry picked from commit
9181ec28da94705a763edbe60bd2a87e5f882beb)
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:58 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce skipped:
0c4e21ec13 am:
4c2c4dade5
Change-Id: Iacb795d8e741d01d8c81c95657174f2fb43142c5
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:56 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce skipped:
0c4e21ec13
Change-Id: I3d83c500f4504773a3d9160d984ef91aeaa63d36
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:55 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce
Change-Id: I552dd39875722ac041979c4cce15e378cab32d5a
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:53 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525
Change-Id: I855b3b72659643947a5d28f01ac37dd6ab920a4f
Andre Eisenbach [Wed, 4 Apr 2018 20:38:38 +0000 (13:38 -0700)]
DO NOT MERGE SMP: Validate remote elliptic curve points
Fixes:
72377774
Test: net_test_stack_smp (where applicable)
Change-Id: Iefcf97364493467075fadefd77d12716f71cd4f6
(cherry picked from commit
9181ec28da94705a763edbe60bd2a87e5f882beb)
Android Build Merger (Role) [Mon, 16 Apr 2018 20:07:56 +0000 (20:07 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
1a9023fffb
Change-Id: I296f52fdb61084a34b5b9212f119570a073d5fab
Andre Eisenbach [Wed, 4 Apr 2018 20:38:38 +0000 (13:38 -0700)]
DO NOT MERGE SMP: Validate remote elliptic curve points
Fixes:
72377774
Test: net_test_stack_smp (where applicable)
Change-Id: Iefcf97364493467075fadefd77d12716f71cd4f6
(cherry picked from commit
9181ec28da94705a763edbe60bd2a87e5f882beb)
TreeHugger Robot [Fri, 13 Apr 2018 20:29:14 +0000 (20:29 +0000)]
Merge changes from topic "am-
175db33b-0d30-4b99-87fe-
9ef5c15643d6" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee
DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ
TreeHugger Robot [Fri, 13 Apr 2018 20:29:14 +0000 (20:29 +0000)]
Merge "DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ" into nyc-dev
TreeHugger Robot [Fri, 13 Apr 2018 18:13:11 +0000 (18:13 +0000)]
Merge "DO NOT MERGE Fix OOB read in process_l2cap_cmd" into mnc-dev
TreeHugger Robot [Fri, 13 Apr 2018 18:13:11 +0000 (18:13 +0000)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9-mnc-dev" into mnc-dr1.5-dev
* changes:
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78
DO NOT MERGE Fix OOB read in process_l2cap_cmd
TreeHugger Robot [Fri, 13 Apr 2018 18:13:11 +0000 (18:13 +0000)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9-mnc-dev" into cw-e-dev
* changes:
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78
DO NOT MERGE Fix OOB read in process_l2cap_cmd
TreeHugger Robot [Fri, 13 Apr 2018 18:13:11 +0000 (18:13 +0000)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9-mnc-dev" into mnc-dr-dev
* changes:
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78
DO NOT MERGE Fix OOB read in process_l2cap_cmd
TreeHugger Robot [Fri, 13 Apr 2018 18:13:11 +0000 (18:13 +0000)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9-mnc-dev" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744 skipped:
85d60d236f am:
fdcc979af8
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744 skipped:
85d60d236f
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78
DO NOT MERGE Fix OOB read in process_l2cap_cmd
TreeHugger Robot [Fri, 13 Apr 2018 18:13:11 +0000 (18:13 +0000)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9-mnc-dev" into nyc-dev
* changes:
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744 skipped:
85d60d236f
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78
DO NOT MERGE Fix OOB read in process_l2cap_cmd
TreeHugger Robot [Fri, 13 Apr 2018 18:13:04 +0000 (18:13 +0000)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
1bbea25a24
DO NOT MERGE Fix OOB read in process_l2cap_cmd
TreeHugger Robot [Fri, 13 Apr 2018 18:13:04 +0000 (18:13 +0000)]
Merge "DO NOT MERGE Fix OOB read in process_l2cap_cmd" into nyc-dev
TreeHugger Robot [Fri, 13 Apr 2018 17:14:22 +0000 (17:14 +0000)]
Merge changes from topic "am-
95b770cf-713e-4c26-a12d-
ca284eb0fbd7" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442 am:
860b821bef
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e
DO NOT MERGE Add bounds check for BNEP_Write
TreeHugger Robot [Fri, 13 Apr 2018 17:14:22 +0000 (17:14 +0000)]
Merge changes from topic "am-
95b770cf-713e-4c26-a12d-
ca284eb0fbd7" into nyc-dev
* changes:
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e
DO NOT MERGE Add bounds check for BNEP_Write
Android Build Merger (Role) [Thu, 12 Apr 2018 23:58:51 +0000 (23:58 +0000)]
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee
Change-Id: I3e632c0dd3d5552a0e06f85adeeec91670aa00c4
Ajay Panicker [Thu, 12 Apr 2018 23:50:06 +0000 (16:50 -0700)]
DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ
Bug:
74121659
Test: Compiles
Change-Id: Ib29dd50cee9decda2d73bb79b84215ea4c6ead75
Android Build Merger (Role) [Thu, 12 Apr 2018 23:05:01 +0000 (23:05 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744 skipped:
85d60d236f am:
fdcc979af8
Change-Id: Ib71c5614b6e9771f9fe6bcd069ca6312a956b241
Android Build Merger (Role) [Thu, 12 Apr 2018 23:05:00 +0000 (23:05 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744 skipped:
85d60d236f
Change-Id: Ifdee9a139c36cf21c62c0332aa6fea731a8da526
Android Build Merger (Role) [Thu, 12 Apr 2018 23:04:59 +0000 (23:04 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744
Change-Id: Idd62c798d03219b2dbb54e89942b2c89d1091a24
Android Build Merger (Role) [Thu, 12 Apr 2018 23:04:57 +0000 (23:04 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20
Change-Id: I4a6bcdd9ed82515e64e6d1b5421dd1bea8570f40
Android Build Merger (Role) [Thu, 12 Apr 2018 23:04:56 +0000 (23:04 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78
Change-Id: I85ab7eacfae89ad824845707f34b1f15913fbff0
Hansong Zhang [Thu, 12 Apr 2018 23:01:19 +0000 (16:01 -0700)]
DO NOT MERGE Fix OOB read in process_l2cap_cmd
Bug:
74202041
Bug:
74196706
Bug:
74201143
Test: manual
Change-Id: Ic25f7f3777d0375f76cc91e4d129b1636f1c388d
Android Build Merger (Role) [Thu, 12 Apr 2018 23:01:50 +0000 (23:01 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
1bbea25a24
Change-Id: I27a10e02807359d9fe4042098c99b2a1af2c015e
Hansong Zhang [Thu, 12 Apr 2018 23:01:19 +0000 (16:01 -0700)]
DO NOT MERGE Fix OOB read in process_l2cap_cmd
Bug:
74202041
Bug:
74196706
Bug:
74201143
Test: manual
Change-Id: Ic25f7f3777d0375f76cc91e4d129b1636f1c388d
Android Build Merger (Role) [Thu, 12 Apr 2018 19:25:22 +0000 (19:25 +0000)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
769aeaaf44
Change-Id: Ide45620dc9fdb923c6c400872dcb9fb9df4be232
Hansong Zhang [Thu, 12 Apr 2018 19:23:36 +0000 (12:23 -0700)]
DO NOT MERGE Add bounds check for BNEP_Write
Bug:
74947856
Test: manual
Change-Id: I19d9dee53b9cac800c66becef4861e4ad9602bdf
Android Build Merger (Role) [Thu, 12 Apr 2018 19:25:10 +0000 (19:25 +0000)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442 am:
860b821bef
Change-Id: I15b5fb1a459941fbb01d2c35f0bce72421ffd79a
Android Build Merger (Role) [Thu, 12 Apr 2018 19:25:03 +0000 (19:25 +0000)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442
Change-Id: I8e2c1ec223c8a8657607ffaf7303c4e8fbd624d8
Android Build Merger (Role) [Thu, 12 Apr 2018 19:24:57 +0000 (19:24 +0000)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1
Change-Id: Ic76fd58c1524bc09fd0c1c536306fbd2f3b0120a
Android Build Merger (Role) [Thu, 12 Apr 2018 19:24:51 +0000 (19:24 +0000)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20
Change-Id: Ie83d15c1bad2a38c4193771848f96e88c23a11e9
Android Build Merger (Role) [Thu, 12 Apr 2018 19:24:45 +0000 (19:24 +0000)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e
Change-Id: Ib83180b9764bd61ea32525b71446e24018cb3be0
Hansong Zhang [Thu, 12 Apr 2018 19:23:36 +0000 (12:23 -0700)]
DO NOT MERGE Add bounds check for BNEP_Write
Bug:
74947856
Test: manual
Change-Id: I19d9dee53b9cac800c66becef4861e4ad9602bdf
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-
c847555c-4096-4a49-be7e-
49a3a9c0417a" into nyc-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-
c847555c-4096-4a49-be7e-
49a3a9c0417a" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8 am:
73cc697204
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-
c847555c-4096-4a49-be7e-
49a3a9c0417a" into mnc-dr1.5-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-
c847555c-4096-4a49-be7e-
49a3a9c0417a" into cw-e-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-
c847555c-4096-4a49-be7e-
49a3a9c0417a" into mnc-dr-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge "DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback" into mnc-dev
TreeHugger Robot [Wed, 11 Apr 2018 20:04:54 +0000 (20:04 +0000)]
Merge "DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback" into nyc-dev
TreeHugger Robot [Wed, 11 Apr 2018 20:04:54 +0000 (20:04 +0000)]
Merge changes from topic "am-
86018ff8-723c-4999-a292-
3b3936b26850" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
e04c8be75d
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into mnc-dr1.5-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into cw-e-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into mnc-dr-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge "DO NOT MERGE Handle bad packet length in gatts_process_read_req" into mnc-dev
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into nyc-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647 am:
2040db3cf0
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:19:58 +0000 (15:19 +0000)]
Merge "DO NOT MERGE Handle bad packet length in gatts_process_read_req" into nyc-dev
TreeHugger Robot [Wed, 11 Apr 2018 15:19:58 +0000 (15:19 +0000)]
Merge changes from topic "nyc-dev-check-pkt-when-processing-gatt-reads" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
810e669d7a
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Mon, 9 Apr 2018 20:41:56 +0000 (20:41 +0000)]
Merge changes from topic "am-
3af7df0e-526d-4f8d-8ff1-
cc32970b6656" into mnc-dr1.5-dev
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b
DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result
TreeHugger Robot [Mon, 9 Apr 2018 20:41:56 +0000 (20:41 +0000)]
Merge changes from topic "am-
3af7df0e-526d-4f8d-8ff1-
cc32970b6656" into cw-e-dev
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b
DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result
TreeHugger Robot [Mon, 9 Apr 2018 20:41:56 +0000 (20:41 +0000)]
Merge changes from topic "am-
3af7df0e-526d-4f8d-8ff1-
cc32970b6656" into mnc-dr-dev
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b
DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result
TreeHugger Robot [Mon, 9 Apr 2018 20:41:56 +0000 (20:41 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result" into mnc-dev
TreeHugger Robot [Mon, 9 Apr 2018 20:41:56 +0000 (20:41 +0000)]
Merge changes from topic "am-
3af7df0e-526d-4f8d-8ff1-
cc32970b6656" into nyc-dev
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9 skipped:
11fe847f5b
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b
DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result
TreeHugger Robot [Mon, 9 Apr 2018 20:41:56 +0000 (20:41 +0000)]
Merge changes from topic "am-
3af7df0e-526d-4f8d-8ff1-
cc32970b6656" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9 skipped:
11fe847f5b am:
463584ae61
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9 skipped:
11fe847f5b
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b
DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result
OSDN Git Service
