OSDN Git Service
Myles Watson [Sat, 13 Jan 2018 01:25:55 +0000 (01:25 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e am:
8fa876b282 am:
27626267a5 am:
52de7b9029 -s ours am:
54d56dce26 -s ours am:
325785a28e -s ours
am:
f0a0bd2150 -s ours
Change-Id: I47f6f6a0e16aa3a21bc5c5e31b53bd4c5df0c0c7
Ajay Panicker [Sat, 13 Jan 2018 01:25:24 +0000 (01:25 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into nyc-dev am:
e71013a820 am:
b0c0a69f45
am:
7a26c58e12
Change-Id: Icfbf6a3498f6c1c13e2a4329f9e1289f5e058553
Myles Watson [Sat, 13 Jan 2018 01:19:46 +0000 (01:19 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e am:
8fa876b282 am:
27626267a5 am:
52de7b9029 -s ours am:
54d56dce26 -s ours
am:
325785a28e -s ours
Change-Id: I19bd48a00903e888ad9b758b1b8c1a7ec23c10eb
Ajay Panicker [Sat, 13 Jan 2018 01:19:15 +0000 (01:19 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into nyc-dev am:
e71013a820
am:
b0c0a69f45
Change-Id: I5213c3a1a5b8a75330e09f08858f3dd394cbcfbe
Myles Watson [Sat, 13 Jan 2018 01:14:00 +0000 (01:14 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e am:
8fa876b282 am:
27626267a5 am:
52de7b9029 -s ours
am:
54d56dce26 -s ours
Change-Id: I0ddfab9277c515385a388e26652ca8098d6d9e94
Ajay Panicker [Sat, 13 Jan 2018 01:13:39 +0000 (01:13 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into nyc-dev
am:
e71013a820
Change-Id: I1064d189d31afa12f9ab42b195ad2e962964e5bb
Myles Watson [Sat, 13 Jan 2018 01:09:44 +0000 (01:09 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e am:
8fa876b282 am:
27626267a5
am:
52de7b9029 -s ours
Change-Id: I1ac8501dca4c9d1b44f400c093cfdc2069d09339
Myles Watson [Sat, 13 Jan 2018 01:06:51 +0000 (01:06 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e am:
8fa876b282
am:
27626267a5
Change-Id: I73f0933ab850b4bb3eedf66cc9c588d04d74129b
Ajay Panicker [Sat, 13 Jan 2018 01:05:11 +0000 (01:05 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into nyc-dev
Myles Watson [Sat, 13 Jan 2018 01:03:44 +0000 (01:03 +0000)]
Merge "BNEP: Check received frame type" into nyc-dev am:
3f25ecf630 am:
b4cfd05ab3
am:
8502e4862d
Change-Id: I32e0ab42d76d45fa33146007c222732ec6ef80c9
Myles Watson [Sat, 13 Jan 2018 01:03:19 +0000 (01:03 +0000)]
PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback am:
bcad4b57fa am:
7158d558cf
am:
9b46b1e674
Change-Id: Ie3bcf1d89d5d9a0aaaff359362653dee32d89008
Myles Watson [Sat, 13 Jan 2018 01:00:06 +0000 (01:00 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e
am:
8fa876b282
Change-Id: Ie9c47005fcc5891b2b9c382c032d4e4bed3cb591
Myles Watson [Sat, 13 Jan 2018 00:57:15 +0000 (00:57 +0000)]
Merge "BNEP: Check received frame type" into nyc-dev am:
3f25ecf630
am:
b4cfd05ab3
Change-Id: Idb9ca3709ac93e4357e941ef08e5387c96a43c82
Myles Watson [Sat, 13 Jan 2018 00:56:43 +0000 (00:56 +0000)]
PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback am:
bcad4b57fa
am:
7158d558cf
Change-Id: I8746aae1cf5ea683988b4605e426b5e29b7c25de
Myles Watson [Sat, 13 Jan 2018 00:55:36 +0000 (00:55 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev
am:
7cfaf8724e
Change-Id: I194a6c63954b7b2847973974005c6d79aa11289c
Myles Watson [Sat, 13 Jan 2018 00:51:27 +0000 (00:51 +0000)]
Merge "BNEP: Check received frame type" into nyc-dev
am:
3f25ecf630
Change-Id: Icc576479d4390cbb076aba74e90004b521ff4e29
Myles Watson [Sat, 13 Jan 2018 00:51:04 +0000 (00:51 +0000)]
PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback
am:
bcad4b57fa
Change-Id: I5e1b04e62aaa25f18e1911fdeeb051abe140f99f
Myles Watson [Sat, 13 Jan 2018 00:47:00 +0000 (00:47 +0000)]
Merge "BNEP: Check received frame type" into nyc-dev
TreeHugger Robot [Sat, 13 Jan 2018 00:38:16 +0000 (00:38 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev
Stanley Tng [Fri, 12 Jan 2018 22:29:24 +0000 (22:29 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into mnc-dev am:
cc798ea2e5 am:
92268a691f am:
8909982e6f am:
3b485ad0f7 -s ours am:
9efed59da5 -s ours am:
7c7d5fb5f7 -s ours
am:
dbd120f7ce -s ours
Change-Id: I37a46ac9d21f7b4a70647d045860fe979686a1f1
Stanley Tng [Fri, 12 Jan 2018 22:23:33 +0000 (22:23 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into mnc-dev am:
cc798ea2e5 am:
92268a691f am:
8909982e6f am:
3b485ad0f7 -s ours am:
9efed59da5 -s ours
am:
7c7d5fb5f7 -s ours
Change-Id: I8af0cad8ce12ec50cddc7eec34df650643ec9787
Stanley Tng [Fri, 12 Jan 2018 22:18:59 +0000 (22:18 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into mnc-dev am:
cc798ea2e5 am:
92268a691f am:
8909982e6f am:
3b485ad0f7 -s ours
am:
9efed59da5 -s ours
Change-Id: I49c36b6af9bf279319a070a68f2fe91b71b1b525
Myles Watson [Wed, 10 Jan 2018 17:51:28 +0000 (09:51 -0800)]
PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback
Patch from b/
67078939
Test: build
Bug:
67110692
Change-Id: I63b857d031c55d3a0754e4101e330843eb422b2a
Merged-In: I63b857d031c55d3a0754e4101e330843eb422b2a
Stanley Tng [Fri, 12 Jan 2018 22:13:54 +0000 (22:13 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into mnc-dev am:
cc798ea2e5 am:
92268a691f am:
8909982e6f
am:
3b485ad0f7 -s ours
Change-Id: If144e4104654de7d198b2bb641bdb0c5c65af625
Stanley Tng [Fri, 12 Jan 2018 22:09:30 +0000 (22:09 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into nyc-dev am:
70b70baa89 am:
4523d9cff0
am:
f7257a97db
Change-Id: Icb9c8ade01d4cee43da88ee8a118d36ed35abbe0
Stanley Tng [Fri, 12 Jan 2018 22:09:29 +0000 (22:09 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into mnc-dev am:
cc798ea2e5 am:
92268a691f
am:
8909982e6f
Change-Id: I3438b832e39d85a4e8d598e8f611e5d8a3ef185b
Stanley Tng [Fri, 12 Jan 2018 22:03:57 +0000 (22:03 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into nyc-dev am:
70b70baa89
am:
4523d9cff0
Change-Id: I054dd86fb610e0fbb6f1116bd34e17b1ea09e8eb
Stanley Tng [Fri, 12 Jan 2018 22:03:56 +0000 (22:03 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into mnc-dev am:
cc798ea2e5
am:
92268a691f
Change-Id: I540a273548859c9d013092b9d1eaee753f469366
Stanley Tng [Fri, 12 Jan 2018 22:00:43 +0000 (22:00 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into mnc-dev
am:
cc798ea2e5
Change-Id: Ic6eda5df4183df713e656d31d8c12d075823a27c
Stanley Tng [Fri, 12 Jan 2018 21:59:26 +0000 (21:59 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into nyc-dev
am:
70b70baa89
Change-Id: I2e130d676996336fe8486f2345a05bea2a13f638
TreeHugger Robot [Fri, 12 Jan 2018 21:51:02 +0000 (21:51 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into mnc-dev
TreeHugger Robot [Fri, 12 Jan 2018 21:50:24 +0000 (21:50 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into nyc-dev
Myles Watson [Thu, 11 Jan 2018 22:20:26 +0000 (14:20 -0800)]
BNEP: Check received frame type
Bug:
68818034
Test: build
Change-Id: I2b9f32b92d72f226361e6a80f20f9c7ee77f6019
Merged-In: I2b9f32b92d72f226361e6a80f20f9c7ee77f6019
Pavlin Radoslavov [Fri, 12 Jan 2018 21:02:24 +0000 (21:02 +0000)]
Merge "Allocate/free the SDP connection timers only during stack startup/shutdown" into nyc-dev am:
42fe329fea am:
7dd87869f2
am:
03c8d807be
Change-Id: I5886739b7b43393889deceb48b03b267fd82851d
Pavlin Radoslavov [Fri, 12 Jan 2018 20:56:07 +0000 (20:56 +0000)]
Merge "Allocate/free the SDP connection timers only during stack startup/shutdown" into nyc-dev am:
42fe329fea
am:
7dd87869f2
Change-Id: I2699a1d9c4a17de8ad796cfb18c3597d5f653991
Pavlin Radoslavov [Fri, 12 Jan 2018 20:51:07 +0000 (20:51 +0000)]
Merge "Allocate/free the SDP connection timers only during stack startup/shutdown" into nyc-dev
am:
42fe329fea
Change-Id: Ib7da76b8dc02ccd92433e31bb75ec37665e46e44
TreeHugger Robot [Fri, 12 Jan 2018 20:44:45 +0000 (20:44 +0000)]
Merge "Allocate/free the SDP connection timers only during stack startup/shutdown" into nyc-dev
Hansong Zhang [Fri, 12 Jan 2018 19:38:30 +0000 (19:38 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into mnc-dev am:
a8ff361dfd am:
7d1d2cc30e am:
f4ebee33e8 am:
babe2f806a -s ours am:
6ad1b26ba3 am:
531aa6ac4b
am:
3dc167be47
Change-Id: Ie3fd1ea95db6f62da6ab8327547b04bf79b56f26
Hansong Zhang [Fri, 12 Jan 2018 19:38:12 +0000 (19:38 +0000)]
DO NOT MERGE Fix unexpected behavior in SDP am:
ed45f06fbd am:
40f7822e27 am:
98916aaef5 am:
932e2eb358 -s ours am:
7af6f1b8e8 -s ours am:
944510e511 -s ours
am:
c1faf30a21 -s ours
Change-Id: I0fa4e878a8a65889cce25d1c9f866a5e125cb06d
Hansong Zhang [Fri, 12 Jan 2018 19:33:01 +0000 (19:33 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into mnc-dev am:
a8ff361dfd am:
7d1d2cc30e am:
f4ebee33e8 am:
babe2f806a -s ours am:
6ad1b26ba3
am:
531aa6ac4b
Change-Id: I91f4898d5a1d33b49abedc99f4d5edefc92401e9
Hansong Zhang [Fri, 12 Jan 2018 19:32:46 +0000 (19:32 +0000)]
DO NOT MERGE Fix unexpected behavior in SDP am:
ed45f06fbd am:
40f7822e27 am:
98916aaef5 am:
932e2eb358 -s ours am:
7af6f1b8e8 -s ours
am:
944510e511 -s ours
Change-Id: I28a2b5e6667a6489e0311b589e11f907da769f8b
Hansong Zhang [Fri, 12 Jan 2018 19:26:58 +0000 (19:26 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into mnc-dev am:
a8ff361dfd am:
7d1d2cc30e am:
f4ebee33e8 am:
babe2f806a -s ours
am:
6ad1b26ba3
Change-Id: I181a32e5ca511ec470c1310dd40805a34a45d410
Hansong Zhang [Fri, 12 Jan 2018 19:26:43 +0000 (19:26 +0000)]
DO NOT MERGE Fix unexpected behavior in SDP am:
ed45f06fbd am:
40f7822e27 am:
98916aaef5 am:
932e2eb358 -s ours
am:
7af6f1b8e8 -s ours
Change-Id: Ifbb6e4f861a9359234200152721770320355949b
Hansong Zhang [Fri, 12 Jan 2018 19:22:18 +0000 (19:22 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into mnc-dev am:
a8ff361dfd am:
7d1d2cc30e am:
f4ebee33e8
am:
babe2f806a -s ours
Change-Id: I20565790a235d9dcabdd109fab65fcde414c06e3
Hansong Zhang [Fri, 12 Jan 2018 19:22:07 +0000 (19:22 +0000)]
DO NOT MERGE Fix unexpected behavior in SDP am:
ed45f06fbd am:
40f7822e27 am:
98916aaef5
am:
932e2eb358 -s ours
Change-Id: Idfd8f956d46797228420c352c4fd4d7114863cd5
Hansong Zhang [Fri, 12 Jan 2018 19:17:33 +0000 (19:17 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into mnc-dev am:
a8ff361dfd am:
7d1d2cc30e
am:
f4ebee33e8
Change-Id: I7bed5ffc40cb15e7f20b704dcb505d6f5ff52ab4
Hansong Zhang [Fri, 12 Jan 2018 19:17:30 +0000 (19:17 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev am:
6e677aab4a am:
bd83a19885
am:
956bb8e1fb
Change-Id: Iaa957284a29d1e101a7347e5e3c5fded62037e90
Hansong Zhang [Fri, 12 Jan 2018 19:17:14 +0000 (19:17 +0000)]
DO NOT MERGE Fix unexpected behavior in SDP am:
ed45f06fbd am:
40f7822e27
am:
98916aaef5
Change-Id: I40da0b8f6c127487fe5680cb8cec937b3725b083
Hansong Zhang [Fri, 12 Jan 2018 19:17:14 +0000 (19:17 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev am:
5755f66220 am:
88312931fd
am:
0c8337c1e7
Change-Id: Ied3f18ad9151277c0929c291f34d7c192240f265
Hansong Zhang [Fri, 12 Jan 2018 19:11:54 +0000 (19:11 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev am:
6e677aab4a
am:
bd83a19885
Change-Id: Ie010a0be70337bca536e0f34075a4ff571c4f4ad
Hansong Zhang [Fri, 12 Jan 2018 19:11:40 +0000 (19:11 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev am:
5755f66220
am:
88312931fd
Change-Id: Ie2eaf68551b3d36eefeb0c802317da5ecf430df5
Hansong Zhang [Fri, 12 Jan 2018 19:10:54 +0000 (19:10 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into mnc-dev am:
a8ff361dfd
am:
7d1d2cc30e
Change-Id: I9757d3ee82598276e9fd5b5484435d6699c8c8e3
Hansong Zhang [Fri, 12 Jan 2018 19:10:39 +0000 (19:10 +0000)]
DO NOT MERGE Fix unexpected behavior in SDP am:
ed45f06fbd
am:
40f7822e27
Change-Id: I2f6f6d64a86d91bdcd2ae672743be9cdc8d3c2d5
Hansong Zhang [Fri, 12 Jan 2018 19:06:19 +0000 (19:06 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into mnc-dev
am:
a8ff361dfd
Change-Id: I35090af42c4d986cbb874f2599f0d34cfadafb43
Hansong Zhang [Fri, 12 Jan 2018 19:06:07 +0000 (19:06 +0000)]
DO NOT MERGE Fix unexpected behavior in SDP
am:
ed45f06fbd
Change-Id: Ia72f140ecc6f943c2b25a981d8528a00813eb0ff
Hansong Zhang [Fri, 12 Jan 2018 19:05:30 +0000 (19:05 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev
am:
6e677aab4a
Change-Id: I572e0effe9b6a1952378d320b403756486102897
Hansong Zhang [Fri, 12 Jan 2018 19:05:11 +0000 (19:05 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev
am:
5755f66220
Change-Id: I509364deeeb49d1c0e78bd5146edc04348cbc4fc
Hansong Zhang [Fri, 12 Jan 2018 18:59:31 +0000 (18:59 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into mnc-dev
Hansong Zhang [Fri, 12 Jan 2018 18:59:31 +0000 (18:59 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev
Hansong Zhang [Fri, 12 Jan 2018 18:59:27 +0000 (18:59 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev
Pavlin Radoslavov [Fri, 12 Jan 2018 01:28:16 +0000 (17:28 -0800)]
Allocate/free the SDP connection timers only during stack startup/shutdown
This avoids freeing the sdp_conn_timer within the alarm callback itself.
Bug:
67110137
Test: Manual
Change-Id: I775b4b532cd42cf207258c53c6052a167a124627
Merged-In: I775b4b532cd42cf207258c53c6052a167a124627
(cherry picked from commit
ef6a4a0c9d9220a7d909863349d7a0c0b967d54c)
Hansong Zhang [Thu, 11 Jan 2018 00:59:48 +0000 (16:59 -0800)]
DO NOT MERGE Fix unexpected behavior in reading BNEP packets
Bug:
67863755
Bug:
69177251
Bug:
69177292
Bug:
69271284
Test: BNEP still works
Change-Id: I41b8bfe5e123a56b8812124178663735f2bf3372
Hansong Zhang [Thu, 11 Jan 2018 00:59:48 +0000 (16:59 -0800)]
DO NOT MERGE Fix unexpected behavior in reading BNEP packets
Bug:
67863755
Bug:
69177251
Bug:
69177292
Bug:
69271284
Test: BNEP still works
Change-Id: I41b8bfe5e123a56b8812124178663735f2bf3372
Stanley Tng [Wed, 10 Jan 2018 21:13:15 +0000 (13:13 -0800)]
DO NOT MERGE Remove memory reference to invalid mem in error log
Remove the memory reference to an invalid memory inside an error log
message.
Test: Edit code to force the error condition and make sure the new error
log does not crashed.
Bug:
67058064
Merged-In: I55ec6d8b53e5987cd7721e0ae3ffccc11d6638a0
Change-Id: I55ec6d8b53e5987cd7721e0ae3ffccc11d6638a0
(cherry picked from commit
11cd7277a1d0da9013a8381cddbfc096e9adaed6)
Stanley Tng [Wed, 10 Jan 2018 21:13:15 +0000 (13:13 -0800)]
DO NOT MERGE Remove memory reference to invalid mem in error log
Remove the memory reference to an invalid memory inside an error log
message.
Test: Edit code to force the error condition and make sure the new error
log does not crashed.
Bug:
67058064
Merged-In: I55ec6d8b53e5987cd7721e0ae3ffccc11d6638a0
Change-Id: I55ec6d8b53e5987cd7721e0ae3ffccc11d6638a0
(cherry picked from commit
11cd7277a1d0da9013a8381cddbfc096e9adaed6)
Myles Watson [Wed, 10 Jan 2018 17:51:28 +0000 (09:51 -0800)]
PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback
Patch from b/
67078939
Test: build
Bug:
67110692
Change-Id: I63b857d031c55d3a0754e4101e330843eb422b2a
Merged-In: I63b857d031c55d3a0754e4101e330843eb422b2a
Ajay Panicker [Thu, 11 Jan 2018 04:50:20 +0000 (20:50 -0800)]
DO NOT MERGE: AVRCP: Check the number of text value attributes requested
Test: Builds
Bug:
69479009
Change-Id: Ibd6a448eda65f857ddfacc1ee7ad1ead3b46fb8d
Pavlin Radoslavov [Thu, 11 Jan 2018 01:21:14 +0000 (01:21 +0000)]
Removed alarm callback execution statistics am:
b9ebb4ab26 am:
944a096f7c
am:
484a8ff430
Change-Id: I7a2e3f2fd89c4c7df94f3650768c221f986b2c18
Pavlin Radoslavov [Thu, 11 Jan 2018 01:18:37 +0000 (01:18 +0000)]
Removed alarm callback execution statistics am:
b9ebb4ab26
am:
944a096f7c
Change-Id: I69a82dfa9cc6e3201ffed6cf6761a3a6c1f4ff70
Pavlin Radoslavov [Thu, 11 Jan 2018 01:16:06 +0000 (01:16 +0000)]
Removed alarm callback execution statistics
am:
b9ebb4ab26
Change-Id: I21f70a4a332f9335e609b763f26571c3f74991dd
Hansong Zhang [Wed, 10 Jan 2018 03:43:20 +0000 (19:43 -0800)]
DO NOT MERGE Fix unexpected behavior in SDP
Bug:
68776054
Bug:
68817966
Test: Bluetooth SDP still works
Change-Id: I4eef22679a313b88d7e8ec463b29dbb592c6b5b9
Merged-In: I4eef22679a313b88d7e8ec463b29dbb592c6b5b9
Hansong Zhang [Wed, 10 Jan 2018 03:36:46 +0000 (19:36 -0800)]
DO NOT MERGE Fix unexpected behavior in SDP
Bug:
68776054
Bug:
68817966
Test: Bluetooth SDP still works
Change-Id: I4eef22679a313b88d7e8ec463b29dbb592c6b5b9
Merged-In: I4eef22679a313b88d7e8ec463b29dbb592c6b5b9
Pavlin Radoslavov [Mon, 8 Jan 2018 19:37:05 +0000 (11:37 -0800)]
Removed alarm callback execution statistics
Updating the alarm state after the callback returns can be problematic
in case the callback itself deleted the alarm.
Bug:
67110137
Test: Manual
Change-Id: Id4de06eebedb792cadd63d09efb68672e9bddc69
Merged-In: Id4de06eebedb792cadd63d09efb68672e9bddc69
(cherry picked from commit
04574e1cde3b0d46b59b4b6ebab935ac60af9f97)
Jacky Cheung [Tue, 7 Nov 2017 19:17:38 +0000 (11:17 -0800)]
DO NOT MERGE ANYWHERE: Disable the use of GATT cache by default.
When a set of GATT services of a bonded device is cached locally,
an application needs to call BluetoothGatt.refresh() to clear it out
and to trigger a new service discovery. By disabling local caching,
a service discovery is performed on every connection and that prevents
an application from getting staled GATT services.
bug:
68954828
Change-Id: I2c07404c3d56a5c8a0ffc86bc65d36480f3c46f2
Scott Bauer [Wed, 11 Oct 2017 22:34:23 +0000 (22:34 +0000)]
Read the correct amount of attributes am:
4d1470eb54 am:
48e5396b99
am:
57f958e7e3
Change-Id: I3a664ecfa9eebde0459f299fa3a26c70c528e3b8
Scott Bauer [Wed, 11 Oct 2017 22:33:55 +0000 (22:33 +0000)]
Read the correct amount of attributes
am:
636b754cfa
Change-Id: I43948bbb53b3075e7e7b016b9127f38245a8f9da
Scott Bauer [Wed, 11 Oct 2017 22:28:54 +0000 (22:28 +0000)]
Read the correct amount of attributes am:
4d1470eb54
am:
48e5396b99
Change-Id: I93404b4895d4609e9f0afbc9d020cfae20f4f820
Scott Bauer [Wed, 11 Oct 2017 22:26:14 +0000 (22:26 +0000)]
Read the correct amount of attributes
am:
4d1470eb54
Change-Id: I153a91a1aba1a78837c397d4ee01bea2d1696e4e
Scott Bauer [Fri, 7 Apr 2017 00:35:40 +0000 (18:35 -0600)]
Read the correct amount of attributes
bta_gattc_cache_load currently attempts to read 0xFF attributes into an
allocation sized to num_attr attributes, which can be smaller than 0xFF.
There aren't more than num_attr bytes in correct data, but this breaks
with dynamic buffer overflow checking in CopperheadOS for the read
system call since fread ends up calling read, which obtains the size of
the allocation from the malloc implementation and then aborts due to the
(potential) overflow.
This would also fail with the default enabled _FORTIFY_SOURCE=2 feature
in the Android Open Source Project if osi_malloc was marked with the
alloc_size attribute. The way it wraps malloc loses that information so
fortify checks aren't done for calls like this.
Bug:
37160362
Change-Id: I68bd170d5378c9d9d21cbda376083bc0b857e15c
Signed-off-by: Scott Bauer <sbauer@plzdonthack.me>
[migrated to C++ file, added 0xFFFF limit and wrote commit message]
Signed-off-by: Daniel Micay <danielmicay@gmail.com>
Scott Bauer [Fri, 7 Apr 2017 00:35:40 +0000 (18:35 -0600)]
Read the correct amount of attributes
bta_gattc_cache_load currently attempts to read 0xFF attributes into an
allocation sized to num_attr attributes, which can be smaller than 0xFF.
There aren't more than num_attr bytes in correct data, but this breaks
with dynamic buffer overflow checking in CopperheadOS for the read
system call since fread ends up calling read, which obtains the size of
the allocation from the malloc implementation and then aborts due to the
(potential) overflow.
This would also fail with the default enabled _FORTIFY_SOURCE=2 feature
in the Android Open Source Project if osi_malloc was marked with the
alloc_size attribute. The way it wraps malloc loses that information so
fortify checks aren't done for calls like this.
Bug:
37160362
Change-Id: I68bd170d5378c9d9d21cbda376083bc0b857e15c
Signed-off-by: Scott Bauer <sbauer@plzdonthack.me>
[migrated to C++ file, added 0xFFFF limit and wrote commit message]
Signed-off-by: Daniel Micay <danielmicay@gmail.com>
Andre Eisenbach [Thu, 17 Aug 2017 00:46:40 +0000 (00:46 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
294cc61f4f am:
5dc24c7b41 am:
8498351370 am:
615de1d1fe -s ours am:
1ee8850324 -s ours am:
27e67ba277 -s ours
am:
5af8ec6e85 -s ours
Change-Id: I8971c22e6641d46e2d1fba13fe55407e3386acb2
Andre Eisenbach [Thu, 17 Aug 2017 00:45:10 +0000 (00:45 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
294cc61f4f am:
5dc24c7b41 am:
8498351370 am:
615de1d1fe -s ours am:
1ee8850324 -s ours
am:
27e67ba277 -s ours
Change-Id: I5fb42670d4a641b39a14e538057a0193d33afb0e
Andre Eisenbach [Thu, 17 Aug 2017 00:42:45 +0000 (00:42 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
294cc61f4f am:
5dc24c7b41 am:
8498351370 am:
615de1d1fe -s ours
am:
1ee8850324 -s ours
Change-Id: I5f54fca3ea0d17cad9a5e5439265c9b40340036c
Andre Eisenbach [Thu, 17 Aug 2017 00:39:39 +0000 (00:39 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
294cc61f4f am:
5dc24c7b41 am:
8498351370
am:
615de1d1fe -s ours
Change-Id: I2e6425620ccf65636ba0b0ba6c783c8bf8764ec0
Andre Eisenbach [Thu, 17 Aug 2017 00:37:42 +0000 (00:37 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
294cc61f4f am:
5dc24c7b41
am:
8498351370
Change-Id: I171cafa603f3bf9d6a91895aba461fa96711c18c
Andre Eisenbach [Thu, 17 Aug 2017 00:32:37 +0000 (00:32 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
294cc61f4f
am:
5dc24c7b41
Change-Id: I27dffd6583706912f79cfd730eca390e930e9294
Andre Eisenbach [Thu, 17 Aug 2017 00:30:38 +0000 (00:30 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot()
am:
294cc61f4f
Change-Id: Ief8d911221408ff79a5addc7a7d58c7ca1a38808
Andre Eisenbach [Wed, 16 Aug 2017 23:27:46 +0000 (23:27 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
82e4754aaa am:
3b90fd7b0c
am:
33aee8d11e
Change-Id: Ie3991cdfd834d3d0ff736562af300251fd70f96c
Andre Eisenbach [Wed, 16 Aug 2017 23:07:45 +0000 (23:07 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
82e4754aaa
am:
3b90fd7b0c
Change-Id: I2e9769b83ab39cfc51320b1116959780dd5d92da
Andre Eisenbach [Wed, 16 Aug 2017 22:52:42 +0000 (22:52 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot()
am:
82e4754aaa
Change-Id: Ica0050f493b45e216daa4c31e6eea38a4921d356
Andre Eisenbach [Tue, 8 Aug 2017 23:51:12 +0000 (16:51 -0700)]
SDP: Bounds check 'id' parameter for free_sdp_slot()
Merged-In: I34e8296ec7ec6b4ffbe1fa0452754f2a421e6ec7
Test: manual
Fixes:
37502513
Change-Id: I34e8296ec7ec6b4ffbe1fa0452754f2a421e6ec7
(cherry picked from commit
b413f1b1365af4273647727e497848f95312d0ec)
Andre Eisenbach [Tue, 8 Aug 2017 22:41:21 +0000 (15:41 -0700)]
SDP: Bounds check 'id' parameter for free_sdp_slot()
Merged-In: I34e8296ec7ec6b4ffbe1fa0452754f2a421e6ec7
Test: manual
Fixes:
37502513
Change-Id: I34e8296ec7ec6b4ffbe1fa0452754f2a421e6ec7
(cherry picked from commit
b413f1b1365af4273647727e497848f95312d0ec)
Tyler Freeman [Fri, 28 Jul 2017 01:21:18 +0000 (18:21 -0700)]
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (3/3)
There are intermittent issues where either the returned Bluetooth
MAC address to Java framework is uninitialized or this address update
arrives too late. This fix will do 2 things:
(1) Returns error when MAC address is unavailable in the native code.
(2) Updates the MAC address later by adding a new broadcast event.
Test: Check address for these cases: factory reset, system reboot, and
Bluetooth re-enable.
Bug:
36709382
(cherry picked from commit
7dc0525365025e17e289869288b1b7d5146306cc)
Merged-In: I7b1c526ee227897c003ac921078f317f96b92604
Change-Id: I9810484a136c69d487a4b415c9265913db6c5cce
Pavlin Radoslavov [Tue, 18 Jul 2017 19:23:04 +0000 (19:23 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e am:
fd94c15a5a am:
0cea290eee am:
97922c7401 am:
c0008b6c2f am:
42b29f1ce6
am:
5328c7a32d
Change-Id: I825dc2f50a83d94b54baf1f430e71c63f6bfcb3e
Pavlin Radoslavov [Tue, 18 Jul 2017 19:22:48 +0000 (19:22 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
8f18afd26c am:
ffa87779a1 am:
7eda996189 am:
ba12732aad -s ours am:
107bb0f68d -s ours am:
73df1dfa11 -s ours
am:
3fe34fe3fb -s ours
Change-Id: Id43622ce2ff6520e12bc80d4d034c59d3ab909ca
Pavlin Radoslavov [Tue, 18 Jul 2017 19:20:44 +0000 (19:20 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e am:
fd94c15a5a am:
0cea290eee am:
97922c7401 am:
c0008b6c2f
am:
42b29f1ce6
Change-Id: Idea1e755dd079731745a899aa7668a0f7179cb9e
Pavlin Radoslavov [Tue, 18 Jul 2017 19:20:17 +0000 (19:20 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
8f18afd26c am:
ffa87779a1 am:
7eda996189 am:
ba12732aad -s ours am:
107bb0f68d -s ours
am:
73df1dfa11 -s ours
Change-Id: If35fa07c33914a1df863f0c72b0d3061ae463678
Pavlin Radoslavov [Tue, 18 Jul 2017 19:12:54 +0000 (19:12 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e am:
fd94c15a5a am:
0cea290eee am:
97922c7401
am:
c0008b6c2f
Change-Id: Id14d11e553b6ba2f3fa688302415c79a537940a2
Pavlin Radoslavov [Tue, 18 Jul 2017 19:12:36 +0000 (19:12 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
8f18afd26c am:
ffa87779a1 am:
7eda996189 am:
ba12732aad -s ours
am:
107bb0f68d -s ours
Change-Id: Ib74d462308ed0e99f75aaca7e9344de3b07ba5a8
Pavlin Radoslavov [Tue, 18 Jul 2017 19:05:51 +0000 (19:05 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e am:
fd94c15a5a am:
0cea290eee
am:
97922c7401
Change-Id: Id1569df9156b8de893dcb5c28997ec4a924eb82e
OSDN Git Service
