kernel: Remove grsecurity patchset

[ipfire-3.x.git] / kernel / config-generic

diff --git a/kernel/config-generic b/kernel/config-generic
index 2fa6db6ace715c098952b391a23a11a27371175d..1ae0bc71207565b2edf8ca11998cdf0c734aa58e 100644 (file)
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -102,6 +102,7 @@ CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_DEBUG_BLK_CGROUP is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
@@ -2068,6 +2069,7 @@ CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
 # CONFIG_TRACE_SINK is not set
 # CONFIG_DEVMEM is not set
+CONFIG_DEVKMEM=y
 
 #
 # Serial drivers
@@ -2115,6 +2117,7 @@ CONFIG_R3964=m
 CONFIG_RAW_DRIVER=y
 CONFIG_MAX_RAW_DEVS=8192
 # CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
 # CONFIG_XILLYBUS is not set
 
 #
@@ -4485,6 +4488,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 #
 CONFIG_PROC_FS=y
 CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_KERNFS=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
@@ -4663,6 +4667,7 @@ CONFIG_DEBUG_KERNEL=y
 # Memory Debugging
 #
 # CONFIG_PAGE_EXTENSION is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
@@ -4695,6 +4700,10 @@ CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
@@ -4781,143 +4790,12 @@ CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_STRICT_DEVMEM=y
+CONFIG_DEBUG_RODATA=y
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
 
 #
 # Security options
 #
-
-#
-# Grsecurity
-#
-CONFIG_PAX_USERCOPY_SLABS=y
-CONFIG_GRKERNSEC=y
-# CONFIG_GRKERNSEC_CONFIG_AUTO is not set
-CONFIG_GRKERNSEC_CONFIG_CUSTOM=y
-CONFIG_GRKERNSEC_PROC_GID=10
-
-#
-# Customize Configuration
-#
-
-#
-# PaX
-#
-
-#
-# PaX Control
-#
-
-#
-# Non-executable pages
-#
-
-#
-# Address Space Layout Randomization
-#
-
-#
-# Miscellaneous hardening features
-#
-CONFIG_PAX_MEMORY_SANITIZE=y
-CONFIG_PAX_MEMORY_STRUCTLEAK=y
-CONFIG_PAX_LATENT_ENTROPY=y
-
-#
-# Memory Protections
-#
-CONFIG_GRKERNSEC_KMEM=y
-CONFIG_GRKERNSEC_BPF_HARDEN=y
-# CONFIG_GRKERNSEC_PERF_HARDEN is not set
-CONFIG_GRKERNSEC_BRUTE=y
-# CONFIG_GRKERNSEC_MODHARDEN is not set
-CONFIG_GRKERNSEC_HIDESYM=y
-CONFIG_GRKERNSEC_RANDSTRUCT=y
-CONFIG_GRKERNSEC_RANDSTRUCT_PERFORMANCE=y
-
-#
-# Role Based Access Control Options
-#
-CONFIG_GRKERNSEC_NO_RBAC=y
-# CONFIG_GRKERNSEC_ACL_HIDEKERN is not set
-CONFIG_GRKERNSEC_ACL_MAXTRIES=3
-CONFIG_GRKERNSEC_ACL_TIMEOUT=30
-
-#
-# Filesystem Protections
-#
-CONFIG_GRKERNSEC_PROC=y
-# CONFIG_GRKERNSEC_PROC_USER is not set
-CONFIG_GRKERNSEC_PROC_USERGROUP=y
-CONFIG_GRKERNSEC_PROC_ADD=y
-CONFIG_GRKERNSEC_LINK=y
-# CONFIG_GRKERNSEC_SYMLINKOWN is not set
-CONFIG_GRKERNSEC_FIFO=y
-CONFIG_GRKERNSEC_SYSFS_RESTRICT=y
-# CONFIG_GRKERNSEC_ROFS is not set
-CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL=y
-CONFIG_GRKERNSEC_CHROOT=y
-CONFIG_GRKERNSEC_CHROOT_MOUNT=y
-CONFIG_GRKERNSEC_CHROOT_DOUBLE=y
-CONFIG_GRKERNSEC_CHROOT_PIVOT=y
-CONFIG_GRKERNSEC_CHROOT_CHDIR=y
-# CONFIG_GRKERNSEC_CHROOT_CHMOD is not set
-CONFIG_GRKERNSEC_CHROOT_FCHDIR=y
-# CONFIG_GRKERNSEC_CHROOT_MKNOD is not set
-CONFIG_GRKERNSEC_CHROOT_SHMAT=y
-CONFIG_GRKERNSEC_CHROOT_UNIX=y
-CONFIG_GRKERNSEC_CHROOT_FINDTASK=y
-CONFIG_GRKERNSEC_CHROOT_NICE=y
-CONFIG_GRKERNSEC_CHROOT_SYSCTL=y
-# CONFIG_GRKERNSEC_CHROOT_RENAME is not set
-# CONFIG_GRKERNSEC_CHROOT_CAPS is not set
-CONFIG_GRKERNSEC_CHROOT_INITRD=y
-
-#
-# Kernel Auditing
-#
-# CONFIG_GRKERNSEC_AUDIT_GROUP is not set
-# CONFIG_GRKERNSEC_EXECLOG is not set
-CONFIG_GRKERNSEC_RESLOG=y
-# CONFIG_GRKERNSEC_CHROOT_EXECLOG is not set
-# CONFIG_GRKERNSEC_AUDIT_PTRACE is not set
-# CONFIG_GRKERNSEC_AUDIT_CHDIR is not set
-# CONFIG_GRKERNSEC_AUDIT_MOUNT is not set
-CONFIG_GRKERNSEC_SIGNAL=y
-CONFIG_GRKERNSEC_FORKFAIL=y
-# CONFIG_GRKERNSEC_TIME is not set
-CONFIG_GRKERNSEC_PROC_IPADDR=y
-
-#
-# Executable Protections
-#
-CONFIG_GRKERNSEC_DMESG=y
-CONFIG_GRKERNSEC_HARDEN_PTRACE=y
-CONFIG_GRKERNSEC_PTRACE_READEXEC=y
-CONFIG_GRKERNSEC_HARDEN_IPC=y
-# CONFIG_GRKERNSEC_TPE is not set
-
-#
-# Network Protections
-#
-CONFIG_GRKERNSEC_BLACKHOLE=y
-CONFIG_GRKERNSEC_NO_SIMULT_CONNECT=y
-# CONFIG_GRKERNSEC_SOCKET is not set
-
-#
-# Physical Protections
-#
-# CONFIG_GRKERNSEC_DENYUSB is not set
-
-#
-# Sysctl Support
-#
-# CONFIG_GRKERNSEC_SYSCTL is not set
-
-#
-# Logging Options
-#
-CONFIG_GRKERNSEC_FLOODTIME=10
-CONFIG_GRKERNSEC_FLOODBURST=6
 CONFIG_KEYS=y
 CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_BIG_KEYS is not set
@@ -4939,6 +4817,7 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set
+# CONFIG_SECURITY_YAMA is not set
 CONFIG_INTEGRITY=y
 CONFIG_INTEGRITY_SIGNATURE=y
 CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y