Narayan Kamath
cab99bb027
Fix full-eng build breakage due to dbacd826a1. am: 6e39c88b1e am: cb3d79385d am: 9fd1c2fe65 am: 6f5467da9a am: a76b9888aa
...
am: 9c44d4865e
Change-Id: Ia1270b19491530ce227252ebe3354d409fb1fb8c
2017-10-04 16:48:07 +00:00
Narayan Kamath
9c44d4865e
Fix full-eng build breakage due to dbacd826a1. am: 6e39c88b1e am: cb3d79385d am: 9fd1c2fe65 am: 6f5467da9a
...
am: a76b9888aa
Change-Id: I09d25914710df08e60254096f5a8806adb06afd1
2017-10-04 16:42:13 +00:00
Narayan Kamath
a76b9888aa
Fix full-eng build breakage due to dbacd826a1. am: 6e39c88b1e am: cb3d79385d am: 9fd1c2fe65
...
am: 6f5467da9a
Change-Id: I9a9449b4653be6b9bedc1ede59ef553e3c9b35e7
2017-10-04 16:33:57 +00:00
Narayan Kamath
6f5467da9a
Fix full-eng build breakage due to dbacd826a1. am: 6e39c88b1e am: cb3d79385d
...
am: 9fd1c2fe65
Change-Id: I2eb887dad807e8f0f77620f3545bda3747a5013c
2017-10-04 16:31:33 +00:00
Narayan Kamath
9fd1c2fe65
Fix full-eng build breakage due to dbacd826a1. am: 6e39c88b1e
...
am: cb3d79385d
Change-Id: Id0425c97a4d88c9fdce284805b79442e2547e4fd
2017-10-04 16:26:16 +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
15d221c0ba
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1 am: 368ec42fa8 am: 6dbd1db1cf am: 58c10b2ab9 -s ours am: 2dbba44e2d
...
am: 583a11b339
Change-Id: I215d12f87d5d644f6ded52a59173d4d7f5940d07
2017-10-04 15:21:14 +00:00
Narayan Kamath
583a11b339
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1 am: 368ec42fa8 am: 6dbd1db1cf am: 58c10b2ab9 -s ours
...
am: 2dbba44e2d
Change-Id: I05eda8a0b1f41b979e5673b822865315244fc4ac
2017-10-04 15:18:57 +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
2dbba44e2d
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1 am: 368ec42fa8 am: 6dbd1db1cf
...
am: 58c10b2ab9 -s ours
Change-Id: If2661808611e72def97f08cec94352adcdef21b2
2017-10-04 15:16:23 +00:00
Narayan Kamath
58c10b2ab9
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1 am: 368ec42fa8
...
am: 6dbd1db1cf
Change-Id: I1cedab2b7136dce49722d88266a36a8e37d97b0a
2017-10-04 14:53:40 +00:00
Narayan Kamath
6dbd1db1cf
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1
...
am: 368ec42fa8
Change-Id: Ie828c72438e70817d134e8b09512c3d10d60e407
2017-10-04 14:51:01 +00: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
45931c5e03
zip_archive: reject files that don't start with an LFH signature. am: 2740bb09e3
...
am: 61f846b71c
Change-Id: I02f427582b1e62e3fad2747eb6ac79aa8622ff20
2017-10-04 12:01:11 +00:00
Narayan Kamath
61f846b71c
zip_archive: reject files that don't start with an LFH signature.
...
am: 2740bb09e3
Change-Id: I7a61a1e7f21edfccc14a3333913f4e1db79ac23c
2017-10-04 11:58:48 +00:00
Narayan Kamath
2740bb09e3
zip_archive: reject files that don't start with an LFH signature.
...
Bug: 64211847
Test: zip_archive_test
Merged-In: Ib89f0def696206ff427be27764c158fab88e4b5d
Merged-In: I275e7c4da05ceeb20401b560c72294f29ef63642
Change-Id: I38705f4e9688326a140aa59a1333b0878ed39c14
2017-10-02 18:03:08 +01: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
Adam Vartanian
5b37a8ce87
Fix integer overflow in utf{16,32}_to_utf8_length am: f0a43dede9 am: 33abf90994 am: 789673b15c am: 1436927851 am: d70e582d67
...
am: 62d5a78df3
Change-Id: If605b2b03790475250c3a5c9627b9f6177c01226
2017-09-11 11:06:21 +00:00
Adam Vartanian
62d5a78df3
Fix integer overflow in utf{16,32}_to_utf8_length am: f0a43dede9 am: 33abf90994 am: 789673b15c am: 1436927851
...
am: d70e582d67
Change-Id: Ia12301ba4850284d81de3a4ed2fe3f519a6859fc
2017-09-11 11:02:51 +00:00
Adam Vartanian
d70e582d67
Fix integer overflow in utf{16,32}_to_utf8_length am: f0a43dede9 am: 33abf90994 am: 789673b15c
...
am: 1436927851
Change-Id: Ia81a894419957960682a221159449f3e92d06b03
2017-09-11 10:58:21 +00:00
Adam Vartanian
1436927851
Fix integer overflow in utf{16,32}_to_utf8_length am: f0a43dede9 am: 33abf90994
...
am: 789673b15c
Change-Id: I352f33cf5a9a402a17f7a0f2c8739b54256392c2
2017-09-11 10:54:22 +00:00
Adam Vartanian
789673b15c
Fix integer overflow in utf{16,32}_to_utf8_length am: f0a43dede9
...
am: 33abf90994
Change-Id: I5509908232bd838a229c1c2f3a35e0960a741288
2017-09-11 10:50:21 +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
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
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
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
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
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
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
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
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