Commit Graph

15109 Commits

Author SHA1 Message Date
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  -s ours

Change-Id: I2bece4ef56298aadb757fbdfdb97f7e52554cdba
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  -s ours

Change-Id: I07a4521a0c2b99e71b41b26294be5b9cf1c8b817
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  -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 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 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 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 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 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 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
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
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 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 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
Josh Gao ffcd14a9b9 Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f
am: 238a980143

Change-Id: I130be434938733fbc3f6ecb9c23f8cdaeac4dba4
2016-11-17 23:42:23 +00:00
Josh Gao 6cac5c9815 adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7
am: 257ae8c6b9

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

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

Change-Id: I7175252aa53b9f133c880537cc0003c3cdd6c6f5
2016-11-17 23:27:37 +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