c29049f4f8
libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55
...
am: 29d054046f
2017-11-02 03:05:45 +00:00
29d054046f
libnetutil: Check dhcp respose packet length am: 61f25d4a36
...
am: cee6d38c55
2017-11-02 03:03:42 +00:00
cee6d38c55
libnetutil: Check dhcp respose packet length
...
am: 61f25d4a36
2017-11-02 03:01:40 +00:00
4bcb04290d
DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3 -s ours am: e1257bad6e -s ours
...
am: 89b22dff0a
2017-10-19 19:18:35 +00:00
6e598b9e9d
DO NOT MERGE : Fix build breakage due to 2d516d2d46. am: eeb93c9a64 -s ours
...
am: 951b0dccf0
2017-10-19 19:18:01 +00:00
28a7d07705
DO NOT MERGE : Fix build breakage due to 2d516d2d46. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours
...
am: 59c7fe7a39
2017-10-19 19:16:47 +00:00
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
89b22dff0a
DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3 -s ours
...
am: e1257bad6e
2017-10-19 19:15:59 +00:00
951b0dccf0
DO NOT MERGE : Fix build breakage due to 2d516d2d46.
...
am: eeb93c9a64
2017-10-19 19:15:19 +00:00
59c7fe7a39
DO NOT MERGE : Fix build breakage due to 2d516d2d46. am: 547c7d9a0b -s ours
...
am: 4732ec6440
2017-10-19 19:14:35 +00:00
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
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
c282fe5c2c
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31
...
am: 3065de2c86
2017-10-18 18:31:04 +00:00
61f25d4a36
libnetutil: Check dhcp respose packet length
...
Bug: 67474440
Test: Manual
Change-Id: I84b533f0101a56ec01e64c7591f3c7e82f513b2e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2017-10-17 17:48:48 +00:00
cb3d79385d
Fix full-eng build breakage due to dbacd826a1.
...
am: 6e39c88b1e
2017-10-04 16:16:21 +00:00
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
368ec42fa8
zip_archive: reject files that don't start with an LFH signature.
...
am: dbacd826a1
2017-10-04 14:45:00 +00:00
e1257bad6e
DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e.
...
am: bfe4b5edb3
2017-10-04 12:35:52 +00:00
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
eeb93c9a64
DO NOT MERGE : Fix build breakage due to 2d516d2d46.
...
Test: make
Test: zip_archive_test
Bug: 64211847
(cherry picked from commit 547c7d9a0bbfe4b5edb3
2017-09-20 16:22:46 +01:00
bfe4b5edb3
DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e.
...
There are no functional changes here. This is in place to make merge
conflicts less likely if any further changes are made to this code in
the future.
Test: make
Test: zip_archive_test
Bug: 64211847
Change-Id: I80ff9712c85d602d27f132ac54f62b3524ac9106
2017-09-20 16:07:06 +01:00
4732ec6440
DO NOT MERGE : Fix build breakage due to 2d516d2d46.
...
am: 547c7d9a0b
2017-09-14 18:53:29 +00:00
547c7d9a0b
DO NOT MERGE : Fix build breakage due to 2d516d2d46.
...
Test: make
Test: zip_archive_test
Bug: 64211847
Change-Id: Ide48ce66542e152d88520dcd6abcd104e48137f6
2017-09-14 16:58:32 +00:00
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
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
3065de2c86
Fix integer overflow in utf{16,32}_to_utf8_length
...
am: c17624db31
2017-09-11 11:18:52 +00:00
33abf90994
Fix integer overflow in utf{16,32}_to_utf8_length
...
am: f0a43dede9
2017-09-11 10:46:20 +00:00
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
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
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
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
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
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
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
f7903d4374
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5
...
am: 368f3d273d
2017-04-11 19:34:26 +00:00
6908996434
Fix out of bound read in libziparchive
...
am: d9fd1863f4
2017-04-11 19:29:57 +00:00
368f3d273d
Do Not Merge: Fix out of bound read in libziparchive
...
am: a8d932f2a5
2017-04-11 19:29:57 +00:00
2b4a6de426
Do Not Merge: Fix out of bound read in libziparchive
...
am: 6fdfd58fe1
2017-04-11 19:29:56 +00:00
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
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
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
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
2016-11-17 23:12:22 +00:00
c80cd472c7
adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d
...
am: 08420b5826
2016-11-17 23:12:06 +00:00
50dcfdf43a
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb
...
am: fa961006fd
2016-11-17 22:57:23 +00:00
08420b5826
adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765
...
am: d0b35e9e1d
2016-11-17 22:57:06 +00:00
fa961006fd
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140
...
am: 7e21e1efeb
2016-11-17 22:42:18 +00:00
d0b35e9e1d
adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours
...
am: 8621700765
2016-11-17 22:42:03 +00:00
7e21e1efeb
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401
...
am: 8027acd140
2016-11-17 22:27:45 +00:00
8621700765
adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e
...
am: 0d5c1a7745
2016-11-17 22:27:30 +00:00
8027acd140
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea
...
am: 55d871c401
2016-11-17 22:00:10 +00:00
tintin