Commit graph

716 commits

Author SHA1 Message Date
Yifan Hong
d298b222cd Freeze kernel configs for r.
Bug: 151966896
Test: builds
Change-Id: I54c4338726fe1c533fae63a8509e23bf4ea7abbc
2020-03-20 18:47:59 -07:00
Yifan Hong
410ab82162 Add script to freeze kernel configs.
Test: freeze.py --bug 151966896 r
Bug: 151966896
Change-Id: Ia06fa9825b36de4326f8fe74f26532397f0cacca
2020-03-20 18:47:59 -07:00
TreeHugger Robot
256a6d383e Merge "Require fs-verity and built-in signature support" into rvc-dev 2020-03-04 00:43:42 +00:00
Victor Hsieh
11010350d8 Require fs-verity and built-in signature support
Test: Treehugger
Bug: 133451372
Change-Id: I44a4b765918daef336b10f35c6d627bd7c06fbba
Merged-In: I44a4b765918daef336b10f35c6d627bd7c06fbba
2020-03-03 09:10:06 -08:00
Alistair Delva
b9e9f5e478 Ensure that CONFIG_VHOST is not set
These drivers have had security problems and it is assumed that Android
devices or virtual guests will themselves not need to support hosting a
virtualized guest. Even with this change, virtualization is still
supported, just the in-kernel accelerators will be unavailable.

Bug: 131891260
Test: TreeHugger
Change-Id: Ib7d8b86a24558c75c5e61931059ef3aa294ffc09
Merged-In: Ib7d8b86a24558c75c5e61931059ef3aa294ffc09
Signed-off-by: Alistair Delva <adelva@google.com>
2020-03-03 01:00:52 +00:00
Suren Baghdasaryan
f5591f5e9e Disable CONFIG_RT_GROUP_SCHED kernel config option
Android does not use per-cgroup CPU allowance for RT tasks feature.
Disable it so that RT task allowance is controlled globally using
/proc/sys/kernel/sched_rt_runtime_us.

Bug: 149954332
Test: TreeHugger
Change-Id: I63fe994732d9abb0119a79870f4c3c772db75aa7
Suggested-by: Snild Dolkow <snild@sony.com>
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Merged-In: I63fe994732d9abb0119a79870f4c3c772db75aa7
2020-03-02 18:46:16 +00:00
Eric Biggers
e007af297c Require that CRYPTO_MD4 not be set
The MD4 digest algorithm is heavily broken and obsolete, and there
shouldn't be any reason for it to be enabled in the kernel's crypto API.
So let's require that it not be enabled.

(Note: explicitly handling MD4 does *not* mean that it's fine to use
every other crypto algorithm.  MD4 is just a particularly obvious case,
which previously was unnecessarily enabled in GKI.  So there was a good
opportunity to make this change together with disabling it in GKI.)

Bug: 150302692
Test: Treehugger
Change-Id: I8884c24d50cf3e33eb5e3b1db46578cd6c3bfaef
Merged-In: I8884c24d50cf3e33eb5e3b1db46578cd6c3bfaef
2020-02-27 14:22:39 -08:00
Eric Biggers
f6eca1a41a Require FS_ENCRYPTION on R-launched devices
The CDD requires file-based encryption on all devices launched with Q or
higher.

Also, in android-4.14 and later the filesystem-specific kconfig options
CONFIG_EXT4_ENCRYPTION and CONFIG_F2FS_FS_ENCRYPTION have been replaced
with a single option CONFIG_FS_ENCRYPTION.  (In android-4.14 and
android-4.19 the old names are still allowed for compatibility, but both
just select CONFIG_FS_ENCRYPTION.)

Thus, start requiring CONFIG_FS_ENCRYPTION=y.

Bug: 150245658
Test: Treehugger
Change-Id: Ia08ce7adadf3f32d27e565f5be54085bf9c711ee
Merged-In: Ia08ce7adadf3f32d27e565f5be54085bf9c711ee
2020-02-26 14:41:06 -08:00
Automerger Merge Worker
05250565e4 Enable PM_WAKELOCKS am: 3e296981c0 am: 395230ca3d am: b49bb950a6
Change-Id: Id5dfca636eea7e93b40ecd6a7d581271dd0318e4
2020-02-19 02:43:36 +00:00
Automerger Merge Worker
b49bb950a6 Enable PM_WAKELOCKS am: 3e296981c0 am: 395230ca3d
Change-Id: Ia32e301174f72e0e37e9ae3f4e496990e5592f7f
2020-02-19 02:29:22 +00:00
Automerger Merge Worker
395230ca3d Enable PM_WAKELOCKS am: 3e296981c0
Change-Id: I3f875196182d53f46f948f439e9d62dc70755d64
2020-02-19 02:12:20 +00:00
Ram Muthiah
3e296981c0 Enable PM_WAKELOCKS
Bug: 148922129
Test: Treehugger
Change-Id: If37309cdfd86229ace9d000be33f7d4e9b5567bd
2020-02-18 22:31:13 +00:00
Automerger Merge Worker
047cfe593b Merge "Do not enable CONFIG_DEBUG_FS for R launched devices" am: 582f3ed8eb am: b026905c17 am: 62180e0fc8
Change-Id: I65f853887a0389ba508e49d11013ccc515665ac7
2020-02-13 07:31:11 +00:00
Automerger Merge Worker
62180e0fc8 Merge "Do not enable CONFIG_DEBUG_FS for R launched devices" am: 582f3ed8eb am: b026905c17
Change-Id: I247c3cc86bace942a57b90c516d386db018a0d86
2020-02-13 07:13:20 +00:00
Automerger Merge Worker
b026905c17 Merge "Do not enable CONFIG_DEBUG_FS for R launched devices" am: 582f3ed8eb
Change-Id: Iedcfcf2ff4fe5b18ddbe6f0e46fca63ee41ef0b8
2020-02-13 07:02:19 +00:00
Treehugger Robot
582f3ed8eb Merge "Do not enable CONFIG_DEBUG_FS for R launched devices" 2020-02-13 06:49:30 +00:00
Hridya Valsaraju
1ae8444327 Do not enable CONFIG_DEBUG_FS for R launched devices
CONFIG_DEBUG_FS must not be enabled for R-launched devices.

Test: build, boot
Bug: 134669095
Change-Id: Ib85440e2cd73d6b00481733f5dc05dd95fe98afe
2020-02-12 14:22:28 -08:00
Automerger Merge Worker
6a82442764 Replace SCHED_TUNE with UCLAMP for android-5.4 am: f40913bfe8 am: c0aefc2d34 am: a3fd3bec8e
Change-Id: I806ce85397d8a4ec7ca6cd35f4c543fdde21cb80
2020-02-11 06:11:33 +00:00
Automerger Merge Worker
a3fd3bec8e Replace SCHED_TUNE with UCLAMP for android-5.4 am: f40913bfe8 am: c0aefc2d34
Change-Id: I284c70daede6f2c11178f2b34d94476eba98f37d
2020-02-11 05:56:03 +00:00
Automerger Merge Worker
c0aefc2d34 Replace SCHED_TUNE with UCLAMP for android-5.4 am: f40913bfe8
Change-Id: Iecc87b1da8abddf46303a713a44dc43779ea81f1
2020-02-11 05:43:12 +00:00
Ram Muthiah
f40913bfe8 Replace SCHED_TUNE with UCLAMP for android-5.4
Bug: 145626605
Change-Id: If28fb46d3f9ae03b4b3064aada57b55ec0f397bc
Test: Treehugger
Signed-off-by: Ram Muthiah <rammuthiah@google.com>
2020-02-10 17:40:07 -08:00
Automerger Merge Worker
554aca3324 Allow IKHEADERS to be either =y or =m am: 2139b3bf53 am: cc7cca4b32 am: 2cbbc1883d
Change-Id: Ibb11b5eba8f6023e7cd7e7d675d6afc0a5a9395d
2020-01-29 02:31:39 +00:00
Automerger Merge Worker
2cbbc1883d Allow IKHEADERS to be either =y or =m am: 2139b3bf53 am: cc7cca4b32
Change-Id: I39fbb2b10907ba4d55f546d14794354886a547db
2020-01-29 02:21:48 +00:00
Ram Muthiah
cc7cca4b32 Allow IKHEADERS to be either =y or =m
am: 2139b3bf53

Change-Id: I1cc863556e8e0199b6beccf4abab39e1e83719ec
2020-01-28 18:12:27 -08:00
Ram Muthiah
2139b3bf53 Allow IKHEADERS to be either =y or =m
There will be no immutable GKI modules for the R release.
Vendors may have the option to enable IKHEADERS as a module
for non GKI builds.

5.4 is allowed only as a GKI. Note the difference in configuration
for IKHEADERS between 5.4 and 4.14/4.19.

Bug: 143488798
Test: Treehugger
Change-Id: I775b6cf0122d69345ee6d7f06561d0ffb6316559
2020-01-28 16:36:56 -08:00
Automerger Merge Worker
000c0c62ee Merge "android R: replace CONFIG_MEMCG requirement with CONFIG_PSI" am: be04f4299c am: 35fa23d616 am: bea66afd91
Change-Id: I0f12ae583d93f81c48823617a9b94b53deeac05f
2020-01-28 18:15:35 +00:00
Automerger Merge Worker
bea66afd91 Merge "android R: replace CONFIG_MEMCG requirement with CONFIG_PSI" am: be04f4299c am: 35fa23d616
Change-Id: I6c5757f748a3b4a4afe30a1b35b845cfa9eb6e81
2020-01-28 18:00:36 +00:00
Suren Baghdasaryan
35fa23d616 Merge "android R: replace CONFIG_MEMCG requirement with CONFIG_PSI"
am: be04f4299c

Change-Id: I2a9dc715d92df12700cc654298bbdb78fc87e8a8
2020-01-28 09:51:32 -08:00
Suren Baghdasaryan
be04f4299c Merge "android R: replace CONFIG_MEMCG requirement with CONFIG_PSI" 2020-01-28 17:39:42 +00:00
Suren Baghdasaryan
5f92c3d697 android R: replace CONFIG_MEMCG requirement with CONFIG_PSI
With adoption of PSI events as low memory notification mechanism MEMCG
becomes optional and PSI becomes mandatory. Note that MEMCG can still be
used for instance in Android Go devices but it's not mandatory anymore.

Bug: 147468269
Test: CtsKernelConfigTestCases on a system with CONFIG_MEMCG=n
Change-Id: I379f2a386f81342af8375c1ef510ae7a5e1ae914
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2020-01-27 15:48:12 -08:00
Automerger Merge Worker
5dc90247fa Drop SECURITY_PERF_EVENTS_RESTRICT requirement am: 1a018a6cca am: 6c446a4d30 am: 849ce7921a
Change-Id: Ia56cb1162c4320c8f47d94ad82d857279d9ee3ec
2020-01-27 20:59:49 +00:00
Automerger Merge Worker
849ce7921a Drop SECURITY_PERF_EVENTS_RESTRICT requirement am: 1a018a6cca am: 6c446a4d30
Change-Id: I80a24a0b90cf78936cecffa5d6f23456588447e6
2020-01-27 20:41:20 +00:00
Alistair Delva
6c446a4d30 Drop SECURITY_PERF_EVENTS_RESTRICT requirement
am: 1a018a6cca

Change-Id: I8cc3e566db7dd6021d8fe069b1b8e507036731ad
2020-01-27 12:24:58 -08:00
Alistair Delva
1a018a6cca Drop SECURITY_PERF_EVENTS_RESTRICT requirement
This requirement is obsolete and the common kernel no longer supports
the feature. An alternative has been devised, see "perf_event: Add
support for LSM and SELinux checks" upstream.

Bug: 137092007
Link: https://lore.kernel.org/lkml/20191014170308.70668-1-joel@joelfernandes.org/
Change-Id: I4bb1f1d3cf659c663367c091cf730480e1d03337
Signed-off-by: Alistair Delva <adelva@google.com>
2020-01-27 09:41:00 -08:00
Automerger Merge Worker
1758931af4 android-{4.14,4.19,5.4} - require CONFIG_DUMMY=y am: cf273891e6 am: 79b7852590 am: 71e5fa70a8
Change-Id: Ib7fa64cc33961e637ab12bbf47c28f1134793cb8
2020-01-18 23:58:45 +00:00
Automerger Merge Worker
71e5fa70a8 android-{4.14,4.19,5.4} - require CONFIG_DUMMY=y am: cf273891e6 am: 79b7852590
Change-Id: I2c849fef9bf29c6ed24b7fa48270d8a10906b037
2020-01-18 23:46:14 +00:00
Maciej enczykowski
79b7852590 android-{4.14,4.19,5.4} - require CONFIG_DUMMY=y
am: cf273891e6

Change-Id: I68cf71e4bf341fe32b5d3d91804e9a01be64c653
2020-01-18 15:33:13 -08:00
Maciej Żenczykowski
cf273891e6 android-{4.14,4.19,5.4} - require CONFIG_DUMMY=y
Dummy network interface required for upcoming self-tests.

Bug: 147203196
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0e69147f940c8c4fdc3bc9c89fc591be15096702
2020-01-18 02:35:19 +00:00
Automerger Merge Worker
141b6ac06b Merge "Make configs required to pass CTS tests mandatory" am: a70baf63ed am: 64b77ba403 am: a1d90b3873
Change-Id: Icf8cea4d1b6c797defb0f381be37c3d7cb2d848c
2020-01-16 21:18:18 +00:00
Automerger Merge Worker
a1d90b3873 Merge "Make configs required to pass CTS tests mandatory" am: a70baf63ed am: 64b77ba403
Change-Id: Ib0fb329ead790b009a85a3ab2e180513b4138d0c
2020-01-16 21:08:00 +00:00
Alistair Delva
64b77ba403 Merge "Make configs required to pass CTS tests mandatory"
am: a70baf63ed

Change-Id: I609f480882dd62e28be082056756d43f5f212c9c
2020-01-16 12:53:08 -08:00
Alistair Delva
a70baf63ed Merge "Make configs required to pass CTS tests mandatory" 2020-01-16 20:50:36 +00:00
Automerger Merge Worker
800510a76b android-{4.14,4.19,5.4} - require CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y am: 686f3568b3 am: cbd5ebdb75 am: b41dd0d020
Change-Id: I4a83b4ea00ff89a487315ee58c4913b0d75880b6
2020-01-16 07:27:36 +00:00
Automerger Merge Worker
b41dd0d020 android-{4.14,4.19,5.4} - require CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y am: 686f3568b3 am: cbd5ebdb75
Change-Id: I9a03a62e426a13b54b139b671069d86df6a24e6d
2020-01-16 07:18:10 +00:00
Maciej enczykowski
cbd5ebdb75 android-{4.14,4.19,5.4} - require CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y
am: 686f3568b3

Change-Id: Ia43bd944cafb17ef161a1a7c43f493931765cc19
2020-01-15 23:06:22 -08:00
Maciej Żenczykowski
686f3568b3 android-{4.14,4.19,5.4} - require CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y
Quota logging is needed to enable data metering.

Bug: 147203196
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Icf223e83be1c979c95d1622d5a13b3a68716e6e2
2020-01-13 23:48:50 -08:00
Siarhei Vishniakou
8ddc35a69f Make configs required to pass CTS tests mandatory
The CTS tests in CtsHardwareTestCases are required for all Android
devices. In order to pass these tests, several kernel configs must be
enabled. Make these configs mandatory to help OEMs pass the CTS tests.

Configs moved from 'recommended' to 'base':
HID_GENERIC (covered by AsusGamepadTest)
HID_SONY (covered by SonyDualshock4Test)
INPUT
INPUT_EVDEV
INPUT_JOYSTICK
JOYSTICK_XPAD
UHID

Configs added to 'recommended':
HID_STEAM

As more tests are added, more configs will be added to 'base' or
'recommended'.

Bug: 136263708
Test: cross-checked with pixel configs
Change-Id: Ie2790d33d6f9df7526477a3691882f9757043c7b
2020-01-08 15:13:34 -08:00
Eric Biggers
d5da7c7326 Use CONFIG_FS_ENCRYPTION for 5.4 am: 4301b4b22c am: 1e358952b7
am: 6614d49c87

Change-Id: I2cca800e9ee50d48ffd09162bdfb476439b493ec
2019-12-02 12:44:27 -08:00
Eric Biggers
6614d49c87 Use CONFIG_FS_ENCRYPTION for 5.4 am: 4301b4b22c
am: 1e358952b7

Change-Id: I0b4a16d54304551604d25046d6a8f5ec60c5c493
2019-12-02 12:41:51 -08:00
Eric Biggers
1e358952b7 Use CONFIG_FS_ENCRYPTION for 5.4
am: 4301b4b22c

Change-Id: I9342fc8b923aa337bfa738e8250250b995cab0a1
2019-12-02 12:39:20 -08:00