OSDN Git Service
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: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: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 nyc-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 mnc-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
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
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)
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: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: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)
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
Pavlin Radoslavov [Tue, 18 Jul 2017 19:05:38 +0000 (19:05 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
8f18afd26c am:
ffa87779a1 am:
7eda996189
am:
ba12732aad -s ours
Change-Id: Id1a43cefdc006f9f6d24b35b21502c8453bdd673
Pavlin Radoslavov [Tue, 18 Jul 2017 19:01:19 +0000 (19:01 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e am:
fd94c15a5a
am:
0cea290eee
Change-Id: I24ad37b139ec7af93fde160b16da095d77bd4729
Pavlin Radoslavov [Tue, 18 Jul 2017 19:01:05 +0000 (19:01 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
8f18afd26c am:
ffa87779a1
am:
7eda996189
Change-Id: I3587c48c072b808e8a84a63d1e6f63ea39f158b5
Pavlin Radoslavov [Tue, 18 Jul 2017 18:55:47 +0000 (18:55 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into nyc-dev am:
c3619e1436
am:
d647097c74
Change-Id: I60c65481543f6b6ec698419d08b94877717783ff
Pavlin Radoslavov [Tue, 18 Jul 2017 18:55:45 +0000 (18:55 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e
am:
fd94c15a5a
Change-Id: I635b78d48c94608adb9a1ef784bf5884f64610a3
Pavlin Radoslavov [Tue, 18 Jul 2017 18:55:33 +0000 (18:55 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
8f18afd26c
am:
ffa87779a1
Change-Id: I4e93ec83fac0bfa764f7b78bf33d0ba088e5bc3a
Pavlin Radoslavov [Tue, 18 Jul 2017 18:55:33 +0000 (18:55 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
f8fc7f7d11
am:
2b53cd05f2
Change-Id: I7de55b1c83bee83bed75b25c3ab6339a6341402b
Pavlin Radoslavov [Tue, 18 Jul 2017 18:51:27 +0000 (18:51 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev
am:
fdcad53f8e
Change-Id: I3ae12cba736d90e70bb52888063304337550081c
Pavlin Radoslavov [Tue, 18 Jul 2017 18:51:03 +0000 (18:51 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks
am:
8f18afd26c
Change-Id: I23886b18719d28ef3ae397ec6444b9e2692885e8
Pavlin Radoslavov [Tue, 18 Jul 2017 18:50:50 +0000 (18:50 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into nyc-dev
am:
c3619e1436
Change-Id: Iab6a952226fae34db9f34192312839c03cb800d7
Pavlin Radoslavov [Tue, 18 Jul 2017 18:50:36 +0000 (18:50 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks
am:
f8fc7f7d11
Change-Id: Ib41c89b0070c24eb22576bc6536a5b63d19406a7
TreeHugger Robot [Tue, 18 Jul 2017 18:46:45 +0000 (18:46 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev
TreeHugger Robot [Tue, 18 Jul 2017 18:45:57 +0000 (18:45 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into nyc-dev
Pavlin Radoslavov [Tue, 18 Jul 2017 01:12:10 +0000 (18:12 -0700)]
Add missing extension length check while parsing BNEP control packets
Bug:
63146237
Test: External script
Change-Id: I4e519cec1c7dffb8bd42add00bd891e0969a3d9f
(cherry picked from commit
9ab89b7dbe5735b796799f65144efa48595d0230)
(cherry picked from commit
dc7700a43189d2a8607b69ae19a6d646f11ddf51)
(cherry picked from commit
c7874f25a0557ca4413d8db80bab8da842fc389a)
(cherry picked from commit
187bd8aec0aae63c6328981041e5ec7764ece6a9)
(cherry picked from commit
01f46e0aff705dab350cda7f648fb94976ea3988)
Pavlin Radoslavov [Tue, 18 Jul 2017 01:12:10 +0000 (18:12 -0700)]
Add missing extension length check while parsing BNEP control packets
Bug:
63146237
Test: External script
Change-Id: I4e519cec1c7dffb8bd42add00bd891e0969a3d9f
(cherry picked from commit
9ab89b7dbe5735b796799f65144efa48595d0230)
(cherry picked from commit
dc7700a43189d2a8607b69ae19a6d646f11ddf51)
(cherry picked from commit
c7874f25a0557ca4413d8db80bab8da842fc389a)
(cherry picked from commit
187bd8aec0aae63c6328981041e5ec7764ece6a9)
Pavlin Radoslavov [Tue, 18 Jul 2017 00:21:16 +0000 (17:21 -0700)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks
Bug:
63146105
Test: External script
Change-Id: I1281779ccf38d1d2dfb1a6dc0e45c0e533cabbca
Merged-In: I1281779ccf38d1d2dfb1a6dc0e45c0e533cabbca
(cherry picked from commit
4982eb5df30cbcbee5c8b8807be95fdc6dfa63c5)
(cherry picked from commit
a654681c5558904a8abfa1bbab8eafb651c13231)
(cherry picked from commit
64a12d3b6e71d9161837f28ce18c34d924c2bafc)
(cherry picked from commit
8f18afd26c02ae3d46bf14d6e36017965dee0394)
Pavlin Radoslavov [Tue, 18 Jul 2017 00:21:16 +0000 (17:21 -0700)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks
Bug:
63146105
Test: External script
Change-Id: I1281779ccf38d1d2dfb1a6dc0e45c0e533cabbca
Merged-In: I1281779ccf38d1d2dfb1a6dc0e45c0e533cabbca
(cherry picked from commit
4982eb5df30cbcbee5c8b8807be95fdc6dfa63c5)
(cherry picked from commit
a654681c5558904a8abfa1bbab8eafb651c13231)
(cherry picked from commit
64a12d3b6e71d9161837f28ce18c34d924c2bafc)
Pavlin Radoslavov [Thu, 13 Jul 2017 19:30:12 +0000 (19:30 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into mnc-dev am:
c41ba8a569 am:
494625245f am:
19b22ffe8a am:
df16497d1c -s ours am:
9aad8b3ffe -s ours
am:
cc385a427b -s ours
Change-Id: I449a4ffdc5cfff42c8c73a2e8e5e7654d4036508
Pavlin Radoslavov [Thu, 13 Jul 2017 19:27:42 +0000 (19:27 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into mnc-dev am:
c41ba8a569 am:
494625245f am:
19b22ffe8a am:
df16497d1c -s ours
am:
9aad8b3ffe -s ours
Change-Id: I04d5e837ffa4142d9a4b4db92a9cf63f5fc48e29
Pavlin Radoslavov [Thu, 13 Jul 2017 19:25:41 +0000 (19:25 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into mnc-dev am:
c41ba8a569 am:
494625245f am:
19b22ffe8a
am:
df16497d1c -s ours
Change-Id: I43ac50a1683bef1b0f92f03296ba68f6dc0880da
Pavlin Radoslavov [Thu, 13 Jul 2017 19:22:46 +0000 (19:22 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into mnc-dev am:
c41ba8a569 am:
494625245f
am:
19b22ffe8a
Change-Id: Ia027b6cc651ffc920d5fafb7f8dad8f442220706
Pavlin Radoslavov [Thu, 13 Jul 2017 19:20:42 +0000 (19:20 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into mnc-dev am:
c41ba8a569
am:
494625245f
Change-Id: I3de1f423efacac96493de69033538157be2ca8f9
Pavlin Radoslavov [Thu, 13 Jul 2017 19:18:47 +0000 (19:18 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into mnc-dev
am:
c41ba8a569
Change-Id: I85c402bbc30c9954c71be3fe907651b76387653a
Pavlin Radoslavov [Thu, 13 Jul 2017 19:13:42 +0000 (19:13 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into nyc-dev am:
db82859274
am:
c901f08122
Change-Id: Ibdc8cb8e87163eeb9caa8e3c0b519a412293d07e
Pavlin Radoslavov [Thu, 13 Jul 2017 19:11:44 +0000 (19:11 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into nyc-dev
am:
db82859274
Change-Id: I2341681c821d2902ba79d652edb55167f26b7153
TreeHugger Robot [Thu, 13 Jul 2017 19:09:02 +0000 (19:09 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into mnc-dev
TreeHugger Robot [Thu, 13 Jul 2017 19:01:54 +0000 (19:01 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into nyc-dev
Pavlin Radoslavov [Thu, 13 Jul 2017 18:27:29 +0000 (18:27 +0000)]
Merge "Add missing packet length checks while parsing BNEP control packets" into mnc-dev am:
64d3ed3c9d am:
6fca688b42 am:
7a30f0c78a am:
9dc57eff7a am:
9a7909fefe
am:
a51ce5e8f9
Change-Id: I07ab0843b58d95cfd0261cd54dc65cd40a184bef
Pavlin Radoslavov [Thu, 13 Jul 2017 18:27:14 +0000 (18:27 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am:
b5cb6103b9 am:
70ef60cac0 am:
da8e592089 am:
634fc84bbd am:
f4cca28ce7
am:
c18777c2e6
Change-Id: I8e30d779ab33a28a6e11f8671a490e92b55fe2da
Pavlin Radoslavov [Thu, 13 Jul 2017 18:26:57 +0000 (18:26 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am:
d2a3649d6e am:
27db9becc7 am:
84714e10d8 am:
8ec036d751 -s ours am:
a6996df21f -s ours
am:
2fcebaa235 -s ours
Change-Id: I8c0a6e3e8fdafb24739a9f267b944507b287db91
Pavlin Radoslavov [Thu, 13 Jul 2017 18:26:40 +0000 (18:26 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote am:
f7a7f7a948 am:
b4cf6c5aa7 am:
5d9bbfe453 am:
c80b2fc096 -s ours am:
f79aebe2b9 -s ours
am:
9005269de3 -s ours
Change-Id: Ia2e716810d7a667becfe79b5ce5995225ed57648
Pavlin Radoslavov [Thu, 13 Jul 2017 18:24:37 +0000 (18:24 +0000)]
Merge "Add missing packet length checks while parsing BNEP control packets" into mnc-dev am:
64d3ed3c9d am:
6fca688b42 am:
7a30f0c78a am:
9dc57eff7a
am:
9a7909fefe
Change-Id: I9734ec3d308ab8fb98a5923241fbab91ad81af28
Pavlin Radoslavov [Thu, 13 Jul 2017 18:24:21 +0000 (18:24 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am:
b5cb6103b9 am:
70ef60cac0 am:
da8e592089 am:
634fc84bbd
am:
f4cca28ce7
Change-Id: I634762cc7468a03ca94702153dc638ac5506d20a
Pavlin Radoslavov [Thu, 13 Jul 2017 18:24:04 +0000 (18:24 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am:
d2a3649d6e am:
27db9becc7 am:
84714e10d8 am:
8ec036d751 -s ours
am:
a6996df21f -s ours
Change-Id: Icef81edd5fec2d5edee0af3c02f4b85ea75a9d0f
Pavlin Radoslavov [Thu, 13 Jul 2017 18:23:39 +0000 (18:23 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote am:
f7a7f7a948 am:
b4cf6c5aa7 am:
5d9bbfe453 am:
c80b2fc096 -s ours
am:
f79aebe2b9 -s ours
Change-Id: I98be6f0d6399502bbf523e3531865a608111c076
Pavlin Radoslavov [Thu, 13 Jul 2017 18:21:35 +0000 (18:21 +0000)]
Merge "Add missing packet length checks while parsing BNEP control packets" into mnc-dev am:
64d3ed3c9d am:
6fca688b42 am:
7a30f0c78a
am:
9dc57eff7a
Change-Id: Iefe422511cd90f86d95b7d5c576161aae80055e9
Pavlin Radoslavov [Thu, 13 Jul 2017 18:21:15 +0000 (18:21 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am:
b5cb6103b9 am:
70ef60cac0 am:
da8e592089
am:
634fc84bbd
Change-Id: I35386fe81935831e344265a879e8ee2bc05e4dc7
Pavlin Radoslavov [Thu, 13 Jul 2017 18:20:57 +0000 (18:20 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am:
d2a3649d6e am:
27db9becc7 am:
84714e10d8
am:
8ec036d751 -s ours
Change-Id: I3735cfa1430daf543d5cbfdb1609176443feba86
Pavlin Radoslavov [Thu, 13 Jul 2017 18:20:40 +0000 (18:20 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote am:
f7a7f7a948 am:
b4cf6c5aa7 am:
5d9bbfe453
am:
c80b2fc096 -s ours
Change-Id: I143dcc7f5db0b852b596eeb62ac78f1beda40b3c
Pavlin Radoslavov [Thu, 13 Jul 2017 18:19:03 +0000 (18:19 +0000)]
Merge "Add missing packet length checks while parsing BNEP control packets" into mnc-dev am:
64d3ed3c9d am:
6fca688b42
am:
7a30f0c78a
Change-Id: I77d2ac1b4e2e271d42cf555f66951217db7c7f05
Pavlin Radoslavov [Thu, 13 Jul 2017 18:18:49 +0000 (18:18 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am:
b5cb6103b9 am:
70ef60cac0
am:
da8e592089
Change-Id: Ibc97e933ab9dbcb262753946ca0bad8ed3fe716d
Pavlin Radoslavov [Thu, 13 Jul 2017 18:18:33 +0000 (18:18 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am:
d2a3649d6e am:
27db9becc7
am:
84714e10d8
Change-Id: I1a88047cdf70026aaa57f747e4ce614b1d496df0
Pavlin Radoslavov [Thu, 13 Jul 2017 18:18:09 +0000 (18:18 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote am:
f7a7f7a948 am:
b4cf6c5aa7
am:
5d9bbfe453
Change-Id: I0d39c39b4b573b7df297ed1d93191aff18712fec
Pavlin Radoslavov [Thu, 13 Jul 2017 18:16:48 +0000 (18:16 +0000)]
Merge "Add missing packet length checks while parsing BNEP control packets" into mnc-dev am:
64d3ed3c9d
am:
6fca688b42
Change-Id: I2f4b155188edb226c208350addc1d342ef90a55a
Pavlin Radoslavov [Thu, 13 Jul 2017 18:16:35 +0000 (18:16 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am:
b5cb6103b9
am:
70ef60cac0
Change-Id: I17a95052722739e6329e9759fafe1c0a7acfa067
Pavlin Radoslavov [Thu, 13 Jul 2017 18:16:22 +0000 (18:16 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am:
d2a3649d6e
am:
27db9becc7
Change-Id: I5a5ea407d003fc297ee89837ff22fcc0d946c735
Pavlin Radoslavov [Thu, 13 Jul 2017 18:16:08 +0000 (18:16 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote am:
f7a7f7a948
am:
b4cf6c5aa7
Change-Id: I915ceaf816dc806ba91da7791aa1b43460615935
Pavlin Radoslavov [Thu, 13 Jul 2017 18:14:31 +0000 (18:14 +0000)]
Merge "Add missing packet length checks while parsing BNEP control packets" into mnc-dev
am:
64d3ed3c9d
Change-Id: I2ec8b4f3b50082036ce1f335d36fd728cb9c3665
Pavlin Radoslavov [Thu, 13 Jul 2017 18:14:11 +0000 (18:14 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev
am:
b5cb6103b9
Change-Id: I12c131aa3543e524f669f038153de2dbcd6ca63a
Pavlin Radoslavov [Thu, 13 Jul 2017 18:13:55 +0000 (18:13 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev
am:
d2a3649d6e
Change-Id: I781ce0eb5e6ea5b8b8fb029afe6caf81bd9ca9fb
Pavlin Radoslavov [Thu, 13 Jul 2017 18:13:38 +0000 (18:13 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote
am:
f7a7f7a948
Change-Id: I5d1c8050de38dde922f9891e70574205422ee7be
Pavlin Radoslavov [Thu, 13 Jul 2017 18:08:51 +0000 (18:08 +0000)]
Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into nyc-dev am:
ee18c2bdd9
am:
cf3547d9a2
Change-Id: Ia5a9015eb954fd331c2a06120456b98baafc0f17
Pavlin Radoslavov [Thu, 13 Jul 2017 18:08:37 +0000 (18:08 +0000)]
Allocate buffers of the right size when BT_HDR is included am:
510697a0d7
am:
5da7401f62
Change-Id: I551622b60e882a85a9c739ec22d08a5af55cb1c9
Pavlin Radoslavov [Thu, 13 Jul 2017 18:06:58 +0000 (18:06 +0000)]
Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into nyc-dev
am:
ee18c2bdd9
Change-Id: I077fed75c11c360dd38d4988f08dca4dd8ddf604
Pavlin Radoslavov [Thu, 13 Jul 2017 18:06:36 +0000 (18:06 +0000)]
Allocate buffers of the right size when BT_HDR is included
am:
510697a0d7
Change-Id: I5ca796fc392413dbf7f89332d1172904f980fab5
OSDN Git Service
