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

29627 Commits

Author SHA1 Message Date
Tianjie Xu 085efd7931 Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706 am: ebcba388f5 am: 1bc2862ac5 -s ours am: c800d82044 am: 497461adc5 am: 02e7225f78 am: 587efe8ee9 
am: 745f034705

Change-Id: Id2b7e44f75295eb20a0d55aa8abc7a3c6ce9969e
 2017-04-11 20:25:32 +00:00
Tianjie Xu ed22016d12 Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece am: df5ee70490 am: cce7621064 -s ours am: 01574980eb am: 2d37855038 am: 3c3eed744e am: 5fa554a46a 
am: 223de992a4

Change-Id: Id39959956c2ce2f8910d69e31ee5fe9a2638e7b6
 2017-04-11 20:20:01 +00:00
Tianjie Xu 745f034705 Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706 am: ebcba388f5 am: 1bc2862ac5 -s ours am: c800d82044 am: 497461adc5 am: 02e7225f78 
am: 587efe8ee9

Change-Id: Ief97c37295007df0da7ae36efeee8ac541f5e722
 2017-04-11 20:20:01 +00:00
Tianjie Xu 223de992a4 Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece am: df5ee70490 am: cce7621064 -s ours am: 01574980eb am: 2d37855038 am: 3c3eed744e 
am: 5fa554a46a

Change-Id: I80db3090f5ab0efd50051a5fec2c61a5e947ab50
 2017-04-11 20:15:01 +00:00
Tianjie Xu 587efe8ee9 Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706 am: ebcba388f5 am: 1bc2862ac5 -s ours am: c800d82044 am: 497461adc5 
am: 02e7225f78

Change-Id: I687fc898264c93bedb34076bfa6d981d5059f381
 2017-04-11 20:15:01 +00:00
Tianjie Xu f4bb9db0a8 Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29 am: ed33065bfc am: bc8c8e4b56 am: afddaba0cc am: 0b1ad23070 am: d4b4f0a1e1 
am: 2aea56db64

Change-Id: Icecc6630e82f43360d55b925a5946ffd0d608f58
 2017-04-11 20:11:00 +00:00
Tianjie Xu 02e7225f78 Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706 am: ebcba388f5 am: 1bc2862ac5 -s ours am: c800d82044 
am: 497461adc5

Change-Id: I0b66858b609852df5a04aed279412fb2d03975a2
 2017-04-11 20:11:00 +00:00
Tianjie Xu 5fa554a46a Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece am: df5ee70490 am: cce7621064 -s ours am: 01574980eb am: 2d37855038 
am: 3c3eed744e

Change-Id: I065c6eb98fcd7af9e486a211fb6f8611bcc7a5d3
 2017-04-11 20:10:30 +00:00
Adam Lesinski 5382a520e0 Merge "ZipWriter: Keep LFH and CFH in sync" am: a309bc491d 
am: 80d8a9350c

Change-Id: Ic6b7335a0af0203368fda3f5fb130716229ec0d8
 2017-04-11 20:05:26 +00:00
Tianjie Xu 2aea56db64 Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29 am: ed33065bfc am: bc8c8e4b56 am: afddaba0cc am: 0b1ad23070 
am: d4b4f0a1e1

Change-Id: Ib8d12d33296b0b5d618f4815e99eddebda342a5a
 2017-04-11 20:05:01 +00:00
Tianjie Xu 3c3eed744e Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece am: df5ee70490 am: cce7621064 -s ours am: 01574980eb 
am: 2d37855038

Change-Id: I7cd9d0c60ef387cac0454e2adbe6d437899212a6
 2017-04-11 20:05:01 +00:00
Tianjie Xu 497461adc5 Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706 am: ebcba388f5 am: 1bc2862ac5 -s ours 
am: c800d82044

Change-Id: I09b7718561380c974ce2977b4390e12f262c11d7
 2017-04-11 20:05:01 +00:00
Adam Lesinski 80d8a9350c Merge "ZipWriter: Keep LFH and CFH in sync" 
am: a309bc491d

Change-Id: I06f20c0edf1cc60bd39f38d45d512cfbf39bb0a9
 2017-04-11 20:00:27 +00:00
Tianjie Xu d4b4f0a1e1 Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29 am: ed33065bfc am: bc8c8e4b56 am: afddaba0cc 
am: 0b1ad23070

Change-Id: I7aa4a7bb1e6b5619faadfb4cb3e047746a58b71a
 2017-04-11 19:59:59 +00:00
Tianjie Xu 2d37855038 Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece am: df5ee70490 am: cce7621064 -s ours 
am: 01574980eb

Change-Id: I3a929ddc6eb1833b0653511d810662dcbaab8153
 2017-04-11 19:59:59 +00:00
Tianjie Xu c800d82044 Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706 am: ebcba388f5 
am: 1bc2862ac5  -s ours

Change-Id: Id0399ee88604a6128e6ce3f7ee934c033d083861
 2017-04-11 19:59:58 +00:00
Tianjie Xu 0b1ad23070 Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29 am: ed33065bfc am: bc8c8e4b56 
am: afddaba0cc

Change-Id: Ie8f3874506403c092719f595fa7fb2402c6ecf36
 2017-04-11 19:55:28 +00:00
Tianjie Xu 01574980eb Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece am: df5ee70490 
am: cce7621064  -s ours

Change-Id: I38c3c45a1043f56a1283d1ed5ad24016ab216bce
 2017-04-11 19:55:28 +00:00
Tianjie Xu 1bc2862ac5 Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706 
am: ebcba388f5

Change-Id: Ief12b93faaa3517e750b1702db487bb6e276d14b
 2017-04-11 19:55:28 +00:00
Tianjie Xu afddaba0cc Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29 am: ed33065bfc 
am: bc8c8e4b56

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

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

Change-Id: I817162cb2f4e01ac88b1d81f3e7761a3110d116f
 2017-04-11 19:50:57 +00:00
Tianjie Xu bc8c8e4b56 Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29 
am: ed33065bfc

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

Change-Id: Ib81a39d60f1d4e7551d759c6da5707c752eaf657
 2017-04-11 19:45:58 +00: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
Treehugger Robot a309bc491d Merge "ZipWriter: Keep LFH and CFH in sync" 2017-04-11 19:42:21 +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 ed33065bfc Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 
am: 25c0d68d29

Change-Id: I81cde93d4a07077ef54a46d589db868019ac1520
 2017-04-11 19:39:57 +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 25c0d68d29 Fix out of bound read in libziparchive am: d9fd1863f4 
am: 6908996434

Change-Id: Ie3b3e2f6c37ae9495e599f1add092bff39976b3f
 2017-04-11 19:34:28 +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
Jocelyn Bohr 31e27b7bea Merge changes from topic 'trusty_km2_hal' am: a4b40020ef 
am: e53621c1f2

Change-Id: Ibb4104109c1cf3ded6471246fb6366f929358021
 2017-04-11 17:15:32 +00:00
Dan Willemsen dacd341a7a Merge "Remove .(ll)ndk suffix from (ll)ndk_library" am: b37312a794 
am: c0fbad2b2b

Change-Id: I7716d015717044122985f606bf78c55229691dc4
 2017-04-11 17:06:57 +00:00
Jocelyn Bohr e53621c1f2 Merge changes from topic 'trusty_km2_hal' 
am: a4b40020ef

Change-Id: I31e2ef8b8a41876cc6c2288abde798e261d00247
 2017-04-11 17:04:45 +00:00
Dan Willemsen c0fbad2b2b Merge "Remove .(ll)ndk suffix from (ll)ndk_library" 
am: b37312a794

Change-Id: Ide6db0c1ceb6254a2279ca277a2b8a9dbd67b9b7
 2017-04-11 16:55:27 +00:00
Jocelyn Bohr a4b40020ef Merge changes from topic 'trusty_km2_hal' 
* changes:
  trusty: keymaster: update device tests to use 2.0 API
  trusty: keymaster: Implement abort
  trusty: keymaster: Implement finish
  trusty: keymaster: Implement update
  trusty: keymaster: Implement begin
  trusty: keymaster: Implement upgrade_key
  trusty: keymaster: Implement attest_key
  trusty: keymaster: Implement export_key
  trusty: keymaster: Implement import_key
  trusty: keymaster: Implement get_key_characteristics
  trusty: keymaster: Implement generate_key
  trusty: keymaster: Implement add_rng_entropy
  trusty: keymaster: Implement configure
  trusty: keymaster: Begin update from Keymaster 0.3 to 2.0
 2017-04-11 16:52:45 +00:00
Treehugger Robot b37312a794 Merge "Remove .(ll)ndk suffix from (ll)ndk_library" 2017-04-11 16:19:16 +00:00
Elliott Hughes 1f592779c5 Merge "Add a reasonably full implementation of gzip/gunzip/zcat." am: ca3de5562b 
am: a16ad5d45c

Change-Id: Ia3eeaf06ee22473070785a1aee28bc048822d55b
 2017-04-11 15:50:20 +00:00
Elliott Hughes a16ad5d45c Merge "Add a reasonably full implementation of gzip/gunzip/zcat." 
am: ca3de5562b

Change-Id: Id997ac6f852b8036c661376d28d20eacdc3cdc8a
 2017-04-11 15:46:19 +00:00
Elliott Hughes ca3de5562b Merge "Add a reasonably full implementation of gzip/gunzip/zcat." 2017-04-11 15:40:32 +00:00
Dan Willemsen ab89b34b6f Remove .(ll)ndk suffix from (ll)ndk_library 
Soong handles these automatically now.

Bug: 33241851
Test: Android-aosp_arm.mk is the same before/after
Test: build.ninja is the same before/after
Test: build-aosp_arm.ninja is the same before/after
Merged-In: Ica4eedda51bb34db2f39d2c64ea436e1f633bfc3
Change-Id: Ica4eedda51bb34db2f39d2c64ea436e1f633bfc3
 2017-04-11 15:14:28 +00:00
Adam Lesinski d987c9dd9e ZipWriter: Keep LFH and CFH in sync 
We change the GPB in the LocalFileHeader if the entry can not
have a trailing DataDescriptor. Make sure to patch the
CentralFileHeader to have the same bits set.

Modify ZipArchive to check that the data descriptor bit is consistent
between Central and Local file headers.

(cherry-pick of commit e0eca55fe6)

Test: make ziparchive-tests
Bug: 36686974
Change-Id: Ied167570abcf6426b1c678cd40123e5ad65909db
 2017-04-11 01:45:25 +00:00
Keun-young Park 4c44243c45 Merge "poll umount completion from /proc/mounts" am: 625a098573 
am: cb4dadfb08

Change-Id: Iad3165a37e54476bffa7396f7b180da6ca673a3a
 2017-04-11 01:00:51 +00:00
Keun-young Park cb4dadfb08 Merge "poll umount completion from /proc/mounts" 
am: 625a098573

Change-Id: Ie6fc3a126124a61c09c6aababb1da7893bb7eff7
 2017-04-11 00:55:22 +00:00
Keun-young Park 625a098573 Merge "poll umount completion from /proc/mounts" 2017-04-11 00:34:00 +00:00
Jocelyn Bohr 5020603116 trusty: keymaster: update device tests to use 2.0 API 
Test: builds, ran trusty_keymaster_tipc on imx6ul
Change-Id: Ie9e8ee35ec31aead12adb348e6542a648b41fd7a
 2017-04-10 17:33:49 -07:00