aboutsummaryrefslogtreecommitdiffstats
path: root/dashboard/config/linux/android-5.4.config
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2021-10-21 11:07:34 +0200
committerDmitry Vyukov <dvyukov@google.com>2021-10-21 15:05:29 +0200
commit35d15c46245e9a7bc90954d0197ec0d724c744af (patch)
tree5e915676f9d0789352db17e5de170ccc9945dcbd /dashboard/config/linux/android-5.4.config
parent551fb3f0cdc7f2b2baa1221b06c2c21f6dd95797 (diff)
dashboard/config/linux: add secretmem_enable to cmdline
secretmem_enable is required to enable memfd_secret syscall: https://elixir.bootlin.com/linux/v5.15-rc6/source/mm/secretmem.c#L202 (the android 5.10 base config was not generated on HEAD somehow)
Diffstat (limited to 'dashboard/config/linux/android-5.4.config')
-rw-r--r--dashboard/config/linux/android-5.4.config6
1 files changed, 3 insertions, 3 deletions
diff --git a/dashboard/config/linux/android-5.4.config b/dashboard/config/linux/android-5.4.config
index f0a617e33..290052a9d 100644
--- a/dashboard/config/linux/android-5.4.config
+++ b/dashboard/config/linux/android-5.4.config
@@ -441,7 +441,7 @@ CONFIG_LEGACY_VSYSCALL_EMULATE=y
# CONFIG_LEGACY_VSYSCALL_XONLY is not set
# CONFIG_LEGACY_VSYSCALL_NONE is not set
CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="earlyprintk=serial net.ifnames=0 sysctl.kernel.hung_task_all_cpu_backtrace=1 ima_policy=tcb nf-conntrack-ftp.ports=20000 nf-conntrack-tftp.ports=20000 nf-conntrack-sip.ports=20000 nf-conntrack-irc.ports=20000 nf-conntrack-sane.ports=20000 binder.debug_mask=0 rcupdate.rcu_expedited=1 no_hash_pointers page_owner=on sysctl.vm.nr_hugepages=4 sysctl.vm.nr_overcommit_hugepages=4 root=/dev/sda console=ttyS0 vsyscall=native numa=fake=2 kvm-intel.nested=1 spec_store_bypass_disable=prctl nopcid vivid.n_devs=16 vivid.multiplanar=1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2 netrom.nr_ndevs=16 rose.rose_ndevs=16 dummy_hcd.num=8 watchdog_thresh=55 workqueue.watchdog_thresh=140 sysctl.net.core.netdev_unregister_timeout_secs=140"
+CONFIG_CMDLINE="earlyprintk=serial net.ifnames=0 sysctl.kernel.hung_task_all_cpu_backtrace=1 ima_policy=tcb nf-conntrack-ftp.ports=20000 nf-conntrack-tftp.ports=20000 nf-conntrack-sip.ports=20000 nf-conntrack-irc.ports=20000 nf-conntrack-sane.ports=20000 binder.debug_mask=0 rcupdate.rcu_expedited=1 no_hash_pointers page_owner=on sysctl.vm.nr_hugepages=4 sysctl.vm.nr_overcommit_hugepages=4 secretmem_enable root=/dev/sda console=ttyS0 vsyscall=native numa=fake=2 kvm-intel.nested=1 spec_store_bypass_disable=prctl nopcid vivid.n_devs=16 vivid.multiplanar=1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2 netrom.nr_ndevs=16 rose.rose_ndevs=16 dummy_hcd.num=8 watchdog_thresh=55 workqueue.watchdog_thresh=140 sysctl.net.core.netdev_unregister_timeout_secs=140 cgroup_disable=pressure cgroup.memory=nokmem"
# CONFIG_CMDLINE_OVERRIDE is not set
CONFIG_MODIFY_LDT_SYSCALL=y
CONFIG_HAVE_LIVEPATCH=y
@@ -6636,8 +6636,8 @@ CONFIG_KASAN=y
CONFIG_KASAN_GENERIC=y
# CONFIG_KASAN_OUTLINE is not set
CONFIG_KASAN_INLINE=y
-CONFIG_KASAN_STACK_ENABLE=y
-CONFIG_KASAN_STACK=1
+# CONFIG_KASAN_STACK_ENABLE is not set
+CONFIG_KASAN_STACK=0
# CONFIG_TEST_KASAN is not set
# end of Memory Debugging