system-core

Fork

Merge remote-tracking branch 'x86/nougat-x86' into cm-14.1-x86

Merge remote-tracking branch 'lineage/cm-14.1' into cm-14.1-x86

Conflicts:
init/service.cpp

FlattenableUtils::align memsets

Bug: 141890807
Test: boot, check data is zero'd

[basilgello: Back-ported to 14.1:
libutils/include/utils/Flattenable.h -> include/utils/Flattenable.h]

Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>

Change-Id: I45aaeac369f4c5cf3eb44f61c233e00f870a5c79
(cherry picked from commit bf824f8fa50d9f7390057278fefb58e83323a644)
(cherry picked from commit e62a9d7669ac85844d4424474f5c88c096f7160b)

init: set default selinux mode to permissive

To support selinux enforcing mode, we still have a long way to go.
Let's set the default mode to permissive.

init: don't skip starting a service with no domain if permissive

Requires external/libselinux change as well

Change-Id: I3f2887930e15d09014c2594141ba4acbbc8d6d9d

Merge remote-tracking branch 'x86/nougat-x86' into cm-14.1-x86

Merge remote-tracking branch 'lineage/cm-14.1' into cm-14.1-x86

Android 7.1.2 Release 39 (5787804)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXZfNxgAKCRDorT+BmrEO
eJWVAKCCVE/pU5lwm01w/ZwlVxxFCNhucgCfV6DOtVe2MwvsxHwgU5aARNmySM4=
=aOyO
-----END PGP SIGNATURE-----

Merge tag 'android-7.1.2_r39' into nougat-x86

Android 7.1.2 Release 39 (5787804)

Fix a memory leak in gatekeeper.

In violation to the documentation of GateKeeper::GetAuthTokenKey and
GateKeeper::GetPasswordKey, the implementations in SoftGateKeeper
allocate and return buffers and relinquish ownership causing a memory
leak, because the caller expects the implementation to retain ownership.

Bug: 129768470
Bug: 134557251
Test: gatekeeper-unit-tests
Change-Id: I0af9539d3dcd47dfd1e7d80cdee700ea0c2d6d0f
Merged-In: I0af9539d3dcd47dfd1e7d80cdee700ea0c2d6d0f
(cherry picked from commit 6a9c4e7968e73393110b169b33fb636531fe7fc2)

Fix a memory leak in gatekeeper.

In violation to the documentation of GateKeeper::GetAuthTokenKey and
GateKeeper::GetPasswordKey, the implementations in SoftGateKeeper
allocate and return buffers and relinquish ownership causing a memory
leak, because the caller expects the implementation to retain ownership.

Bug: 129768470
Bug: 134557251
Test: gatekeeper-unit-tests
Change-Id: I0af9539d3dcd47dfd1e7d80cdee700ea0c2d6d0f
Merged-In: I0af9539d3dcd47dfd1e7d80cdee700ea0c2d6d0f
(cherry picked from commit 6a9c4e7968e73393110b169b33fb636531fe7fc2)

Make adb use a custom prop for adb root

Change-Id: Ie2b8c5e9d75371da43305f003607869370bbd1a4

init: add install_keyring for TWRP FBE decrypt

Change-Id: Id7652763ec79bb8679aeb85793f1a748e0d67ff9

init.rc: Lock down access to /proc/net/fib_trie

Make /proc/net/fib_trie only readable to root.

Bug: 31269937
Test: Device boots, file has appropriate permissions.
Change-Id: I0d01ce5c043d576344a6732b0b9ff93d62fcaa34
CVE-2017-13165

init.rc: move load_system_props to beginning of 'on fs'

ro.logd.kernel, ro.config.low_ram, ro.logd.timestamp and ro.debuggable
need to be retrieved prior to logd start in order for the service to
behave in a configured manner. Other essential services are also
dependent on these system properties as well, so it just makes sense
to pick them all up first in 'on fs'.

Test: smoke test
Bug: 37425809
Change-Id: I33ad185f397ee527ed3c84cc2bcb40ff8ca785b5

init.rc: set initial cpuset to all cores

Starting zygote early requires cpuset to be initialized to all cores for
foreground cpuset. Change to expolit all cores by default at boot and
let device manufacturers override to proper values in device specific
init script.

Bug: 36576280
Test: marlin boot fast and checked cpuset during early boot
Change-Id: I2c1ce0630e58a7b04d1a453c6740d3f0bce9de9f

String16: remove integer overflows

Bug: 73826242
Test: manual
Change-Id: I32e13d61b944c1a527cf2d95473552d246e322be
(cherry picked from commit 0e5fbea01c228050739abe8d6cd13d7fdfacf6ef)
CVE-2017-13323

String16: remove integer overflows

Bug: 73826242
Test: manual
Change-Id: I32e13d61b944c1a527cf2d95473552d246e322be
Merged-In: I32e13d61b944c1a527cf2d95473552d246e322be
(cherry picked from commit d0648d8dc61fe9ac39d2cd150a332b385a334bdc)

Merge remote-tracking branch 'x86/nougat-x86' into cm-14.1-x86

Conflicts:
init/init.cpp

Merge remote-tracking branch 'lineage/cm-14.1' into cm-14.1-x86

libnetutil: Check dhcp respose packet length

Bug: 67474440
Test: Manual

Change-Id: I84b533f0101a56ec01e64c7591f3c7e82f513b2e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
(cherry picked from commit 61f25d4a3657e79659963d12005afa8c30883015)

Android 7.1.2 Release 36 (N2G48H)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWicTpAAKCRDorT+BmrEO
eDIiAJ9+Hiu7GqFVtyOM5DwPNS4Sx+s1VACfdruL1q6Yk9+QYV0/kSyxoEV/5Gg=
=u9qR
-----END PGP SIGNATURE-----

Merge tag 'android-7.1.2_r36' into nougat-x86

Android 7.1.2 Release 36 (N2G48H)

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
(cherry picked from commit 2740bb09e3cee99032a86a1700cb0a6f14f3a51f)

init: handle ctrl-alt-del event

By setting /proc/sys/kernel/ctrl-alt-del to 1, kernel will trap
ctrl-alt-del event and send a SIGINT signal to init.

Start the ctrl-alt-del service on receiving the signal.

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: I56ba5e31657633b7f33685dd8839d4b3b998e586
(cherry picked from commit 47efc676c849e3abf32001d66e2d6eb887e83c48)

libnetutil: Check dhcp respose packet length

Bug: 67474440
Test: Manual

Change-Id: I84b533f0101a56ec01e64c7591f3c7e82f513b2e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
(cherry picked from commit 61f25d4a3657e79659963d12005afa8c30883015)

Merge cherrypicks of [3166006, 3165952, 3164925, 3164926, 3164927, 3164928, 3167313, 3167314, 3167315, 3167316, 3167317, 3167318, 3167319, 3167320, 3167321, 3167322, 3166318, 3166319, 3166320, 3166321, 3166322, 3166323, 3166324, 3167333, 3167334, 3167373, 3165112, 3166325, 3165229, 3165230] into nyc-mr2-release

Change-Id: I1ceb02446b2daf909b269a7e9a2777182546e414

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
(cherry picked from commit 2740bb09e3cee99032a86a1700cb0a6f14f3a51f)

Merge remote-tracking branch 'x86/nougat-x86' into cm-14.1-x86

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
(cherry picked from commit 2740bb09e3cee99032a86a1700cb0a6f14f3a51f)

Use __ with attribute __noreturn__ to avoid colliding with noreturn.

Change-Id: I5a73ec69b580b2e70b2c68177078fa56b8353c19