Narayan Kamath
b70bb65f24
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39
...
am: 36424c8f5f
2017-10-19 19:22:09 +00:00
Narayan Kamath
36424c8f5f
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d
...
am: d86a41ea39
2017-10-19 19:20:04 +00:00
Narayan Kamath
d86a41ea39
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f
...
am: 5d8784c53d
2017-10-19 19:18:03 +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
2017-10-19 19:16:10 +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
2017-10-19 19:13:59 +00:00
Adam Vartanian
3c374a2ba7
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours
...
am: 069ec60f20
2017-10-18 19:28:58 +00:00
Adam Vartanian
069ec60f20
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours
...
am: fc4b272afe
2017-10-18 19:23:25 +00:00
Adam Vartanian
fc4b272afe
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours
...
am: 47dfd5afee
2017-10-18 19:00:44 +00:00
Adam Vartanian
47dfd5afee
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours
...
am: c282fe5c2c
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
2017-10-18 18:31:04 +00:00
Narayan Kamath
d5715c5d2d
Revert "Fix full-eng build breakage due to dbacd826a100f2c."
...
This reverts commit 6e39c88b1e
2017-10-04 18:23:09 +01:00
Narayan Kamath
a76b9888aa
Fix full-eng build breakage due to dbacd826a1. am: 6e39c88b1e am: cb3d79385d am: 9fd1c2fe65
...
am: 6f5467da9a
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
2017-10-04 16:31:33 +00:00
Narayan Kamath
9fd1c2fe65
Fix full-eng build breakage due to dbacd826a1. am: 6e39c88b1e
...
am: cb3d79385d
2017-10-04 16:26:16 +00:00
Narayan Kamath
cb3d79385d
Fix full-eng build breakage due to dbacd826a1.
...
am: 6e39c88b1e
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
2dbba44e2d
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1 am: 368ec42fa8 am: 6dbd1db1cf
...
am: 58c10b2ab9
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
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
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
2017-10-04 14:45:00 +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
Narayan Kamath
fcf9c96fff
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev
...
am: 64406ab149
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
2017-09-11 11:18:52 +00:00
Adam Vartanian
d70e582d67
Fix integer overflow in utf{16,32}_to_utf8_length am: f0a43dede9 am: 33abf90994 am: 789673b15c
...
am: 1436927851
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
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
2017-09-11 10:50:21 +00:00
Adam Vartanian
33abf90994
Fix integer overflow in utf{16,32}_to_utf8_length
...
am: f0a43dede9
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
2017-08-16 19:40:19 +01: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
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
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
2017-04-11 19:55:28 +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
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
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
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
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
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
2017-04-11 19:39:58 +00:00
Tianjie Xu
ed33065bfc
Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434
...
am: 25c0d68d29
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
2017-04-11 19:39:56 +00:00
Tianjie Xu
25c0d68d29
Fix out of bound read in libziparchive am: d9fd1863f4
...
am: 6908996434
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
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
2017-04-11 19:34:26 +00:00
Tianjie Xu
6908996434
Fix out of bound read in libziparchive
...
am: d9fd1863f4
2017-04-11 19:29:57 +00:00
Tianjie Xu
368f3d273d
Do Not Merge: Fix out of bound read in libziparchive
...
am: a8d932f2a5
2017-04-11 19:29:57 +00:00
Tianjie Xu
2b4a6de426
Do Not Merge: Fix out of bound read in libziparchive
...
am: 6fdfd58fe1
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
