Commit Graph

31493 Commits

Author SHA1 Message Date
Tianjie Xu 585e6a89d7 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  -s ours

Change-Id: I12e470e1fbd46fd10f8092343d7950145da00cca
2017-04-11 20:20:38 +00:00
Tianjie Xu 06e1a3d8b2 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  -s ours

Change-Id: Ia2898016ac6aee1d72a58c62766e989e5d6d5dcf
2017-04-11 20:20:25 +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 e170e3876b 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: Ib2eebcb64ffb95737ef4a739dddf181dcdaa9fae
2017-04-11 20:11:24 +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
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
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
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
Adam Lesinski 91e3f638b7 Merge "libziparchive: verify that gpb flags match" into oc-dev 2017-04-11 18:30:51 +00:00
TreeHugger Robot ce4c78224d Merge changes from topic 'llndk_rename' into oc-dev
* changes:
  Remove .(ll)ndk suffix from (ll)ndk_library
  Remove .(ll)ndk suffix from (ll)ndk_library
2017-04-11 07:22:26 +00:00
Keun-young Park 4d4348c771 Merge "poll umount completion from /proc/mounts" into oc-dev 2017-04-11 01:46:26 +00:00
TreeHugger Robot d4c8d87a9b Merge "ZipWriter: Keep LFH and CFH in sync" into oc-dev 2017-04-11 01:28:45 +00:00
Chia-I Wu 64d1849077 Merge "libgrallocusage: use gralloc1.h usage flags" into oc-dev 2017-04-11 01:08:38 +00:00
Keun-young Park 0e90dee9e0 poll umount completion from /proc/mounts
- umount operation is asynchronous except for root partition.
  Returning from umount does not guarantee completion of
  umount. Poll /proc/mounts to confirm completion of umount.
- Treat all devices mounting to /data as emulated devices. This is
  future proof when fs other than sdcardfs is used.
- Drop quota sync from sync step. There is no differences in
  frequencies of quota error.
- Run umount in reverse order from mounting order so that any
  hidden dependency can be auto-resolved.
- Add dump of lsof and /proc/mounts when umount fails. lsof only runs
  when selinux is toggled into permissive mode. The dump is enabled
  only for non-user build.
- Keep logcat until vold shutdown in case vold has any error to report.

bug: 36551218
Test: python packages/services/Car/tools/bootanalyze/bootanalyze.py -r -c packages/services/Car/tools/bootanalyze/config.yaml -n 1000 -f -e 20 -w 30

Change-Id: I87b17b966d7004c205452d81460b02c6acf50d45
(cherry picked from commit 2ba5c8103d)
2017-04-10 17:48:19 -07:00
Mark Salyzyn b07c58758b Merge "liblog: adapt to removal of property name size limit" into oc-dev 2017-04-10 21:15:27 +00:00
Steven Moreland db9b260096 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
Change-Id: Ia039812817495c00e450eec7292447d5e8f93adb
2017-04-10 12:58:03 -07:00
Dan Willemsen c8202dc5f7 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
Change-Id: Ica4eedda51bb34db2f39d2c64ea436e1f633bfc3
2017-04-10 12:54:31 -07:00
Mark Salyzyn ffa763208b libcutils: fs_config: target_out_path assumed /system breaking partitions
(cherry picked from commit 6e9cb8fd79)

Strip off trailing / then /system and then add back the appropriate
config directory.  This fixes an issue with reading vendor, oem or odm
partitions.

Test: manual build successfully interprets all etc/fs_config_* files.
Test: manual incremental build successfully interprets all etc/fs_config_* files.
Bug: 36071012
Change-Id: Iba363f0731bb8d15e595bb45c56db97722edabc2
2017-04-10 19:32:11 +00:00
Adam Lesinski 73b3aa541f libziparchive: verify that gpb flags match
The Central File Header and Local File Header should
have the same general purpose bit flags set for
consistency.

Bug: 36686974
Test: existing tests pass (ziparchive-tests)
Change-Id: I4602336fa96359219b8a3fd69fd318eed680c43d
2017-04-10 12:10:53 -07:00
Adam Lesinski e0eca55fe6 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.

Test: make ziparchive-tests
Bug: 36686974
Change-Id: Ied167570abcf6426b1c678cd40123e5ad65909db
2017-04-10 12:05:43 -07:00
TreeHugger Robot 40ed56c70b Merge "libcutils: create private/fs_config.h" into oc-dev 2017-04-10 17:22:49 +00:00
Chia-I Wu 1e29643f13 libgrallocusage: use gralloc1.h usage flags
android/hardware/graphics/allocator/2.0/types.h is gone.  Use usage
flags from gralloc1.h.

Test: make
Change-Id: I43bc641edf86229d2df75dba857d7b5706df70e4
2017-04-10 09:47:34 -07:00
Steven Moreland 3f5757977c Merge "Add LLNDK liblog stub library for the VNDK" into oc-dev 2017-04-10 15:30:03 +00:00
Mark Salyzyn a53b83c2f4 libcutils: create private/fs_config.h
(cherry picked from commit a9403f0db8)

private/fs_config.h is required in order to build an independent
test that requires internal binary knowledge of the
etc/fs_config_(files|dirs) files.

Test: compile
Bug: 36071012
Change-Id: I268bcfdbb6d45b7bf6040cbf307a4e34812f5fef
2017-04-10 15:26:43 +00:00
Dan Willemsen 38b4a9265d Add LLNDK liblog stub library for the VNDK
This replaces the liblog_vndk_headers with a true stub library that
exports the vndk headers, and exports the vndk-specific set of symbols.

Test: generated NDK stub maps are the same before/after
Test: aosp_arm; m -j
Test: Enable BOARD_VNDK_VERSION on aosp_arm; m -j (with other changes)
Change-Id: I9037241963b3872a3bc7cf7ab36a70dd4ddcf9bc
(cherry picked from commit 28dab34cbb)
2017-04-07 20:35:02 -07:00
Mark Salyzyn c18f3102da liblog: adapt to removal of property name size limit
There is no longer a name size limit to the properties.

Test: gTest liblog-unit-tests, logd-unit-tests and logcat-unit-tests
Test: liblog-benchmarks BM_is_loggable
Bug: 36696208
Change-Id: I80706a48583192b21f532a06cb8fa183a34e5f76
2017-04-07 11:29:44 -07:00