openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
14,959 Commits 2 Branches 1 Tag 197 MiB
Commit Graph

14959 Commits

Author SHA1 Message Date
Narayan Kamath 6e598b9e9d DO NOT MERGE : Fix build breakage due to 2d516d2d46. am: eeb93c9a64 -s ours 
am: 951b0dccf0

Change-Id: Ib8125c31898b27cfa6607c3cb3ec820c290dfe99
 2017-10-19 19:18:01 +00:00
Narayan Kamath 28a7d07705 DO NOT MERGE : Fix build breakage due to 2d516d2d46. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours 
am: 59c7fe7a39

Change-Id: I9a490f299bcbd250b4266888dab733b0107bf74f
 2017-10-19 19:16:47 +00:00
Narayan Kamath 5d8784c53d Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours 
am: 95584d203f

Change-Id: Ie6fb905368cd34f007bae9cf5503b4b8854c04c1
 2017-10-19 19:16:10 +00:00
Narayan Kamath 951b0dccf0 DO NOT MERGE : Fix build breakage due to 2d516d2d46. 
am: eeb93c9a64  -s ours

Change-Id: I57cebdb9a67a42ce8f37288768c7778406a6289e
 2017-10-19 19:15:19 +00:00
Narayan Kamath 59c7fe7a39 DO NOT MERGE : Fix build breakage due to 2d516d2d46. am: 547c7d9a0b -s ours 
am: 4732ec6440  -s ours

Change-Id: Ib875d2d8f81a2ecd84e329a7a005dddccbb88d84
 2017-10-19 19:14:35 +00:00
Narayan Kamath 95584d203f Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 
am: fcf9c96fff  -s ours

Change-Id: I742295f582bfc96d9981638fe0a21797af714b92
 2017-10-19 19:13:59 +00:00
Adam Vartanian 47dfd5afee Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours 
am: c282fe5c2c  -s ours

Change-Id: I2b2da216b1525f40785a132ec51b59e44e1ebbd8
 2017-10-18 18:41:28 +00:00
Adam Vartanian c282fe5c2c Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 
am: 3065de2c86  -s ours

Change-Id: I36daba675eb298da120301c6c5ebf7f853bc704e
 2017-10-18 18:31:04 +00:00
Narayan Kamath cb3d79385d Fix full-eng build breakage due to dbacd826a1. 
am: 6e39c88b1e

Change-Id: I494d0bd10336ca9c8e771a6a341f6e06578bb59a
 2017-10-04 16:16:21 +00:00
Narayan Kamath 6e39c88b1e Fix full-eng build breakage due to dbacd826a1. 
This wasn't caught by treehugger since it doesn't build this target.

Test: make
Test: zip_archive_test
Bug: 64211847

Change-Id: Iee6e133e236ed639f944e4b8c3c8102cf22e46bb
Merged-In: I275e7c4da05ceeb20401b560c72294f29ef63642
 2017-10-04 16:18:03 +01:00
Narayan Kamath 368ec42fa8 zip_archive: reject files that don't start with an LFH signature. 
am: dbacd826a1

Change-Id: I85664bba898d6be9fff53bc3514c44df4be6cfc7
 2017-10-04 14:45:00 +00:00
Narayan Kamath dbacd826a1 zip_archive: reject files that don't start with an LFH signature. 
Bug: 64211847
Test: zip_archive_test

Merged-In: I275e7c4da05ceeb20401b560c72294f29ef63642
Change-Id: I38705f4e9688326a140aa59a1333b0878ed39c14
 2017-09-25 11:57:55 +01:00
Narayan Kamath eeb93c9a64 DO NOT MERGE : Fix build breakage due to 2d516d2d46. 
Test: make
Test: zip_archive_test
Bug: 64211847

(cherry picked from commit 547c7d9a0b)
(cherry picked from commit bfe4b5edb3)

Change-Id: Ide48ce66542e152d88520dcd6abcd104e48137f6
 2017-09-20 16:22:46 +01:00
Narayan Kamath 4732ec6440 DO NOT MERGE : Fix build breakage due to 2d516d2d46. 
am: 547c7d9a0b  -s ours

Change-Id: I7161f648e78ece5d8ee8b5c73be49e5a52f01b7b
 2017-09-14 18:53:29 +00:00
Narayan Kamath 547c7d9a0b DO NOT MERGE : Fix build breakage due to 2d516d2d46. 
Test: make
Test: zip_archive_test
Bug: 64211847

Change-Id: Ide48ce66542e152d88520dcd6abcd104e48137f6
 2017-09-14 16:58:32 +00:00
Narayan Kamath fcf9c96fff Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev 
am: 64406ab149

Change-Id: I658192aaf7726af803e31e281e84b023827b3a3e
 2017-09-12 20:13:54 +00:00
TreeHugger Robot 64406ab149 Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev 2017-09-12 18:02:20 +00:00
Adam Vartanian 3065de2c86 Fix integer overflow in utf{16,32}_to_utf8_length 
am: c17624db31

Change-Id: I68b3a7dd059de301144d100be632e5803982073f
 2017-09-11 11:18:52 +00:00
Adam Vartanian 33abf90994 Fix integer overflow in utf{16,32}_to_utf8_length 
am: f0a43dede9

Change-Id: Ie8e67d97272102eee952c21d82cf06c6a50f1ea9
 2017-09-11 10:46:20 +00:00
Adam Vartanian f0a43dede9 Fix integer overflow in utf{16,32}_to_utf8_length 
Without an explicit check, the return value can wrap around and return
a value that is far too small to hold the data from the resulting
conversion.

No CTS test is provided because it would need to allocate at least
SSIZE_MAX / 2 bytes of UTF-16 data, which is unreasonable on 64-bit
devices.

Bug: 37723026
Test: run cts -p android.security
Change-Id: Ie2606b92b9eab1acfe8ce4663b43b81156a4cad7
Merged-In: I56ba5e31657633b7f33685dd8839d4b3b998e586
 2017-09-11 10:46:06 +01:00
Adam Vartanian c17624db31 Fix integer overflow in utf{16,32}_to_utf8_length 
Without an explicit check, the return value can wrap around and return
a value that is far too small to hold the data from the resulting
conversion.

No SafetyNet logging is included because when included aapt fails to
link in lmp-mr1-dev.

No CTS test is provided because it would need to allocate at least
SSIZE_MAX / 2 bytes of UTF-16 data, which is unreasonable on 64-bit
devices.

Bug: 37723026
Test: run cts -p android.security
Change-Id: Ice276dc3a5b62ad389b2e9b8caf670c76b7e5218
Merged-In: Ie2606b92b9eab1acfe8ce4663b43b81156a4cad7
 2017-09-07 10:38:08 +01:00
Narayan Kamath 2d516d2d46 zip_archive: reject files that don't start with an LFH signature. 
Bug: 64211847
Test: zip_archive_test

(cherry picked from commit c1a56dcab7)

Change-Id: I510fae950ee00ee2a4e1d69232f3c5c2648d1bfa
 2017-08-16 19:40:19 +01:00
Tianjie Xu 89054eb706 Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours 
am: de0f0b8ecc

Change-Id: I71fa5fa39cc2ffc1dde4a68102399f349ee24d72
 2017-04-11 19:45:57 +00:00
Tianjie Xu 18ccbc2ece Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours 
am: f7903d4374

Change-Id: Ic2cb35bbe317ef86c7eb177d53402d82a1cbe508
 2017-04-11 19:39:58 +00:00
Tianjie Xu de0f0b8ecc Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 
am: 556afe82f2  -s ours

Change-Id: I90fc8d44976b063e450580b5bcb1a079ac09604b
 2017-04-11 19:39:56 +00:00
Tianjie Xu 556afe82f2 Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours 
am: 2b4a6de426

Change-Id: I20e184d8333c0aff48c326fad67909fcf7dc527e
 2017-04-11 19:34:28 +00:00
Tianjie Xu f7903d4374 Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 
am: 368f3d273d  -s ours

Change-Id: I5cc4d5761c5d7f2b8bcee551a693c1858a7bebd1
 2017-04-11 19:34:26 +00:00
Tianjie Xu 6908996434 Fix out of bound read in libziparchive 
am: d9fd1863f4

Change-Id: I5fd0004842ab44ee1c5d38386d7073003eb94a98
 2017-04-11 19:29:57 +00:00
Tianjie Xu 368f3d273d Do Not Merge: Fix out of bound read in libziparchive 
am: a8d932f2a5

Change-Id: I8f373dc3d2e4ecb3aecd5a43f32e3ef01474e712
 2017-04-11 19:29:57 +00:00
Tianjie Xu 2b4a6de426 Do Not Merge: Fix out of bound read in libziparchive 
am: 6fdfd58fe1  -s ours

Change-Id: I04571849d6e4140ac505e33338f9ecaa321ff3dd
 2017-04-11 19:29:56 +00:00
Tianjie Xu a8d932f2a5 Do Not Merge: Fix out of bound read in libziparchive 
We should check the boundary of central directory before checking its
signature. Swap the order of these two checks.

Bug: 36392138
Test: libziparchive doesn't read the signature after boundary check fails.
Change-Id: Ie89f709bb2d1ccb647116fb7ccb1e23c943e5ab8
(cherry picked from commit 74464a1361)
 2017-04-06 18:46:06 +00:00
Tianjie Xu 6fdfd58fe1 Do Not Merge: Fix out of bound read in libziparchive 
We should check the boundary of central directory before checking its
signature. Swap the order of these two checks.

Bug: 36392138
Test: libziparchive doesn't read the signature after boundary check fails.
Change-Id: Ie89f709bb2d1ccb647116fb7ccb1e23c943e5ab8
(cherry picked from commit 74464a1361)
 2017-04-06 11:42:13 -07:00
Tianjie Xu d9fd1863f4 Fix out of bound read in libziparchive 
We should check the boundary of central directory before checking its
signature. Swap the order of these two checks.

Bug: 36392138
Test: libziparchive doesn't read the signature after boundary check fails.
Change-Id: Ie89f709bb2d1ccb647116fb7ccb1e23c943e5ab8
(cherry picked from commit 74464a1361)
 2017-04-06 18:07:02 +00:00
Josh Gao f69ff66c5f Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd 
am: 50dcfdf43a

Change-Id: I705254b519ec3fbf9798500d525b1f74c63f8153
 2016-11-17 23:12:22 +00:00
Josh Gao c80cd472c7 adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d 
am: 08420b5826

Change-Id: I201b41b3fe33e7227c6d3335f5935acf18f9cfa9
 2016-11-17 23:12:06 +00:00
Josh Gao 50dcfdf43a Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb 
am: fa961006fd

Change-Id: I193387ccd84e4425070153a242ab320eb434b44b
 2016-11-17 22:57:23 +00:00
Josh Gao 08420b5826 adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 
am: d0b35e9e1d

Change-Id: Id4c832f6ff9728e305a513d24f4378576e00fe6d
 2016-11-17 22:57:06 +00:00
Josh Gao fa961006fd Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 
am: 7e21e1efeb

Change-Id: I8498b7981b8b63905a80200880d9b8d778ecfaf2
 2016-11-17 22:42:18 +00:00
Josh Gao d0b35e9e1d adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours 
am: 8621700765

Change-Id: I4cd639776fb19959b5b72302fcdb052c1d7a4786
 2016-11-17 22:42:03 +00:00
Josh Gao 7e21e1efeb Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 
am: 8027acd140

Change-Id: I5e81317eefb5d19640506881d4b6717fd92932a4
 2016-11-17 22:27:45 +00:00
Josh Gao 8621700765 adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e 
am: 0d5c1a7745  -s ours

Change-Id: Ic67f5e14491b6e685f898f4f8b7c15161cabb17a
 2016-11-17 22:27:30 +00:00
Josh Gao 8027acd140 Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea 
am: 55d871c401

Change-Id: Ia6e73d6df06b49b3c2f9b83ac5d4c8c52917d25a
 2016-11-17 22:00:10 +00:00
Josh Gao 0d5c1a7745 adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 
am: 1ceca95f8e

Change-Id: I1c8c386d69b3528a9be8f1b2c0032ed04363a228
 2016-11-17 21:59:57 +00:00
Josh Gao 55d871c401 Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a 
am: 0b4bd3feea

Change-Id: Ia706579c1d4f995956c91ffba7aa86e3da4e82d5
 2016-11-17 21:51:38 +00:00
Josh Gao 1ceca95f8e adb: actually fix the windows build. am: 58eda35ace 
am: bbd6d7b3e7

Change-Id: I0d2553e19b3e96e9af4e0aa3493a4b8b36e55431
 2016-11-17 21:51:26 +00:00
Josh Gao 0b4bd3feea Merge "adb: actually fix the windows build." into klp-dev 
am: da66b9100a

Change-Id: If9b3829707e7fc6d9846bc769108180e08d67b5f
 2016-11-17 21:43:27 +00:00
Josh Gao bbd6d7b3e7 adb: actually fix the windows build. 
am: 58eda35ace

Change-Id: If917d578acb8a0b289369f7b5b1aca7deff4a4b9
 2016-11-17 21:43:26 +00:00
Josh Gao da66b9100a Merge "adb: actually fix the windows build." into klp-dev 2016-11-17 21:32:45 +00:00
Josh Gao 58eda35ace adb: actually fix the windows build. 
Bug: http://b/32292581
Change-Id: I714e1f47c2c2e89027989d485cb28891b905f931
 2016-11-15 13:05:11 -08:00
Josh Gao 3b0772f718 Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175 am: 4775e66996 am: 750b4c3c5f am: 667e9f92d4 
am: c88a4dc090

Change-Id: I7aa727558e231368b68ae27659329e543203c648
 2016-11-14 23:03:29 +00:00