4.14.4-2
This commit is contained in:
Jan Alexander Steffens
parent
ce92ff7f34
commit
91b3783f7e
|
|
@ -0,0 +1,102 @@
|
|||
From 5ec2dd3a095442ec1a21d86042a4994f2ba24e63 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <5ec2dd3a095442ec1a21d86042a4994f2ba24e63.1512651251.git.jan.steffens@gmail.com>
|
||||
From: Serge Hallyn <serge.hallyn@canonical.com>
|
||||
Date: Fri, 31 May 2013 19:12:12 +0100
|
||||
Subject: [PATCH] add sysctl to disallow unprivileged CLONE_NEWUSER by default
|
||||
|
||||
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
|
||||
[bwh: Remove unneeded binary sysctl bits]
|
||||
Signed-off-by: Daniel Micay <danielmicay@gmail.com>
|
||||
---
|
||||
kernel/fork.c | 15 +++++++++++++++
|
||||
kernel/sysctl.c | 12 ++++++++++++
|
||||
kernel/user_namespace.c | 3 +++
|
||||
3 files changed, 30 insertions(+)
|
||||
|
||||
diff --git a/kernel/fork.c b/kernel/fork.c
|
||||
index 07cc743698d3668e..4011d68a8ff9305c 100644
|
||||
--- a/kernel/fork.c
|
||||
+++ b/kernel/fork.c
|
||||
@@ -102,6 +102,11 @@
|
||||
|
||||
#define CREATE_TRACE_POINTS
|
||||
#include <trace/events/task.h>
|
||||
+#ifdef CONFIG_USER_NS
|
||||
+extern int unprivileged_userns_clone;
|
||||
+#else
|
||||
+#define unprivileged_userns_clone 0
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* Minimum number of threads to boot the kernel
|
||||
@@ -1555,6 +1560,10 @@ static __latent_entropy struct task_struct *copy_process(
|
||||
if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS))
|
||||
return ERR_PTR(-EINVAL);
|
||||
|
||||
+ if ((clone_flags & CLONE_NEWUSER) && !unprivileged_userns_clone)
|
||||
+ if (!capable(CAP_SYS_ADMIN))
|
||||
+ return ERR_PTR(-EPERM);
|
||||
+
|
||||
/*
|
||||
* Thread groups must share signals as well, and detached threads
|
||||
* can only be started up within the thread group.
|
||||
@@ -2348,6 +2357,12 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
|
||||
if (unshare_flags & CLONE_NEWNS)
|
||||
unshare_flags |= CLONE_FS;
|
||||
|
||||
+ if ((unshare_flags & CLONE_NEWUSER) && !unprivileged_userns_clone) {
|
||||
+ err = -EPERM;
|
||||
+ if (!capable(CAP_SYS_ADMIN))
|
||||
+ goto bad_unshare_out;
|
||||
+ }
|
||||
+
|
||||
err = check_unshare_flags(unshare_flags);
|
||||
if (err)
|
||||
goto bad_unshare_out;
|
||||
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
|
||||
index b86520ed3fb60fbf..f7dab3760839f1a1 100644
|
||||
--- a/kernel/sysctl.c
|
||||
+++ b/kernel/sysctl.c
|
||||
@@ -105,6 +105,9 @@ extern int core_uses_pid;
|
||||
extern char core_pattern[];
|
||||
extern unsigned int core_pipe_limit;
|
||||
#endif
|
||||
+#ifdef CONFIG_USER_NS
|
||||
+extern int unprivileged_userns_clone;
|
||||
+#endif
|
||||
extern int pid_max;
|
||||
extern int pid_max_min, pid_max_max;
|
||||
extern int percpu_pagelist_fraction;
|
||||
@@ -513,6 +516,15 @@ static struct ctl_table kern_table[] = {
|
||||
.proc_handler = proc_dointvec,
|
||||
},
|
||||
#endif
|
||||
+#ifdef CONFIG_USER_NS
|
||||
+ {
|
||||
+ .procname = "unprivileged_userns_clone",
|
||||
+ .data = &unprivileged_userns_clone,
|
||||
+ .maxlen = sizeof(int),
|
||||
+ .mode = 0644,
|
||||
+ .proc_handler = proc_dointvec,
|
||||
+ },
|
||||
+#endif
|
||||
#ifdef CONFIG_PROC_SYSCTL
|
||||
{
|
||||
.procname = "tainted",
|
||||
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
|
||||
index c490f1e4313b998a..dd03bd39d7bf194d 100644
|
||||
--- a/kernel/user_namespace.c
|
||||
+++ b/kernel/user_namespace.c
|
||||
@@ -24,6 +24,9 @@
|
||||
#include <linux/projid.h>
|
||||
#include <linux/fs_struct.h>
|
||||
|
||||
+/* sysctl */
|
||||
+int unprivileged_userns_clone;
|
||||
+
|
||||
static struct kmem_cache *user_ns_cachep __read_mostly;
|
||||
static DEFINE_MUTEX(userns_state_mutex);
|
||||
|
||||
--
|
||||
2.15.1
|
||||
|
||||
11
PKGBUILD
11
PKGBUILD
|
|
@ -5,7 +5,7 @@ pkgbase=linux # Build stock -ARCH kernel
|
|||
#pkgbase=linux-custom # Build kernel with a different name
|
||||
_srcname=linux-4.14
|
||||
pkgver=4.14.4
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
arch=('x86_64')
|
||||
url="https://www.kernel.org/"
|
||||
license=('GPL2')
|
||||
|
|
@ -20,6 +20,7 @@ source=(
|
|||
'60-linux.hook' # pacman hook for depmod
|
||||
'90-linux.hook' # pacman hook for initramfs regeneration
|
||||
'linux.preset' # standard config files for mkinitcpio ramdisk
|
||||
0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
|
||||
)
|
||||
validpgpkeys=(
|
||||
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
|
||||
|
|
@ -29,10 +30,11 @@ sha256sums=('f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7'
|
|||
'SKIP'
|
||||
'e9dcf9aad5977289940cd6e3762af02b87a725ba6c1a9f4af86958dc621e3a84'
|
||||
'SKIP'
|
||||
'a68e94064f040d60e8e4c3380efeee085b54d252d527e960dd17ac688505d5b6'
|
||||
'12a7bd958a820315d8d8be7544976e8a8aa1fb7aa27fcf8377ca68317e3e70a9'
|
||||
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
|
||||
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
|
||||
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
|
||||
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
|
||||
'37b86ca3de148a34258e3176dbf41488d9dbd19e93adbd22a062b3c41332ce85')
|
||||
|
||||
_kernelname=${pkgbase#linux}
|
||||
|
||||
|
|
@ -47,6 +49,9 @@ prepare() {
|
|||
# add latest fixes from stable queue, if needed
|
||||
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
|
||||
|
||||
# disable USER_NS for non-root users by default
|
||||
patch -Np1 -i ../0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
|
||||
|
||||
cp -Tf ../config .config
|
||||
|
||||
if [ "${_kernelname}" != "" ]; then
|
||||
|
|
|
|||
147
config
147
config
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 4.14.0-1 Kernel Configuration
|
||||
# Linux/x86 4.14.4-2 Kernel Configuration
|
||||
#
|
||||
CONFIG_64BIT=y
|
||||
CONFIG_X86_64=y
|
||||
|
|
@ -61,10 +61,10 @@ CONFIG_HAVE_KERNEL_LZMA=y
|
|||
CONFIG_HAVE_KERNEL_XZ=y
|
||||
CONFIG_HAVE_KERNEL_LZO=y
|
||||
CONFIG_HAVE_KERNEL_LZ4=y
|
||||
CONFIG_KERNEL_GZIP=y
|
||||
# CONFIG_KERNEL_GZIP is not set
|
||||
# CONFIG_KERNEL_BZIP2 is not set
|
||||
# CONFIG_KERNEL_LZMA is not set
|
||||
# CONFIG_KERNEL_XZ is not set
|
||||
CONFIG_KERNEL_XZ=y
|
||||
# CONFIG_KERNEL_LZO is not set
|
||||
# CONFIG_KERNEL_LZ4 is not set
|
||||
CONFIG_DEFAULT_HOSTNAME="(none)"
|
||||
|
|
@ -76,8 +76,11 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
|
|||
CONFIG_CROSS_MEMORY_ATTACH=y
|
||||
CONFIG_FHANDLE=y
|
||||
# CONFIG_USELIB is not set
|
||||
# CONFIG_AUDIT is not set
|
||||
CONFIG_AUDIT=y
|
||||
CONFIG_HAVE_ARCH_AUDITSYSCALL=y
|
||||
CONFIG_AUDITSYSCALL=y
|
||||
CONFIG_AUDIT_WATCH=y
|
||||
CONFIG_AUDIT_TREE=y
|
||||
|
||||
#
|
||||
# IRQ subsystem
|
||||
|
|
@ -163,7 +166,7 @@ CONFIG_FAIR_GROUP_SCHED=y
|
|||
CONFIG_CFS_BANDWIDTH=y
|
||||
# CONFIG_RT_GROUP_SCHED is not set
|
||||
CONFIG_CGROUP_PIDS=y
|
||||
# CONFIG_CGROUP_RDMA is not set
|
||||
CONFIG_CGROUP_RDMA=y
|
||||
CONFIG_CGROUP_FREEZER=y
|
||||
# CONFIG_CGROUP_HUGETLB is not set
|
||||
CONFIG_CPUSETS=y
|
||||
|
|
@ -174,11 +177,11 @@ CONFIG_CGROUP_PERF=y
|
|||
CONFIG_CGROUP_BPF=y
|
||||
# CONFIG_CGROUP_DEBUG is not set
|
||||
CONFIG_SOCK_CGROUP_DATA=y
|
||||
# CONFIG_CHECKPOINT_RESTORE is not set
|
||||
CONFIG_CHECKPOINT_RESTORE=y
|
||||
CONFIG_NAMESPACES=y
|
||||
CONFIG_UTS_NS=y
|
||||
CONFIG_IPC_NS=y
|
||||
# CONFIG_USER_NS is not set
|
||||
CONFIG_USER_NS=y
|
||||
CONFIG_PID_NS=y
|
||||
CONFIG_NET_NS=y
|
||||
CONFIG_SCHED_AUTOGROUP=y
|
||||
|
|
@ -200,7 +203,7 @@ CONFIG_HAVE_UID16=y
|
|||
CONFIG_SYSCTL_EXCEPTION_TRACE=y
|
||||
CONFIG_HAVE_PCSPKR_PLATFORM=y
|
||||
CONFIG_BPF=y
|
||||
# CONFIG_EXPERT is not set
|
||||
CONFIG_EXPERT=y
|
||||
CONFIG_UID16=y
|
||||
CONFIG_MULTIUSER=y
|
||||
CONFIG_SGETMASK_SYSCALL=y
|
||||
|
|
@ -208,7 +211,7 @@ CONFIG_SYSFS_SYSCALL=y
|
|||
# CONFIG_SYSCTL_SYSCALL is not set
|
||||
CONFIG_POSIX_TIMERS=y
|
||||
CONFIG_KALLSYMS=y
|
||||
# CONFIG_KALLSYMS_ALL is not set
|
||||
CONFIG_KALLSYMS_ALL=y
|
||||
CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
|
||||
CONFIG_KALLSYMS_BASE_RELATIVE=y
|
||||
CONFIG_PRINTK=y
|
||||
|
|
@ -245,6 +248,7 @@ CONFIG_SLUB_DEBUG=y
|
|||
# CONFIG_COMPAT_BRK is not set
|
||||
# CONFIG_SLAB is not set
|
||||
CONFIG_SLUB=y
|
||||
# CONFIG_SLOB is not set
|
||||
CONFIG_SLAB_MERGE_DEFAULT=y
|
||||
CONFIG_SLAB_FREELIST_RANDOM=y
|
||||
CONFIG_SLAB_FREELIST_HARDENED=y
|
||||
|
|
@ -357,11 +361,11 @@ CONFIG_MODULE_FORCE_LOAD=y
|
|||
CONFIG_MODULE_UNLOAD=y
|
||||
CONFIG_MODULE_FORCE_UNLOAD=y
|
||||
CONFIG_MODVERSIONS=y
|
||||
# CONFIG_MODULE_SRCVERSION_ALL is not set
|
||||
CONFIG_MODULE_SRCVERSION_ALL=y
|
||||
# CONFIG_MODULE_SIG is not set
|
||||
CONFIG_MODULE_COMPRESS=y
|
||||
CONFIG_MODULE_COMPRESS_GZIP=y
|
||||
# CONFIG_MODULE_COMPRESS_XZ is not set
|
||||
# CONFIG_MODULE_COMPRESS_GZIP is not set
|
||||
CONFIG_MODULE_COMPRESS_XZ=y
|
||||
CONFIG_MODULES_TREE_LOOKUP=y
|
||||
CONFIG_BLOCK=y
|
||||
CONFIG_BLK_SCSI_REQUEST=y
|
||||
|
|
@ -486,6 +490,7 @@ CONFIG_X86_CMPXCHG64=y
|
|||
CONFIG_X86_CMOV=y
|
||||
CONFIG_X86_MINIMUM_CPU_FAMILY=64
|
||||
CONFIG_X86_DEBUGCTLMSR=y
|
||||
# CONFIG_PROCESSOR_SELECT is not set
|
||||
CONFIG_CPU_SUP_INTEL=y
|
||||
CONFIG_CPU_SUP_AMD=y
|
||||
CONFIG_CPU_SUP_CENTAUR=y
|
||||
|
|
@ -548,7 +553,7 @@ CONFIG_AMD_NUMA=y
|
|||
CONFIG_X86_64_ACPI_NUMA=y
|
||||
CONFIG_NODES_SPAN_OTHER_NODES=y
|
||||
# CONFIG_NUMA_EMU is not set
|
||||
CONFIG_NODES_SHIFT=6
|
||||
CONFIG_NODES_SHIFT=5
|
||||
CONFIG_ARCH_SPARSEMEM_ENABLE=y
|
||||
CONFIG_ARCH_SPARSEMEM_DEFAULT=y
|
||||
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
|
||||
|
|
@ -600,6 +605,7 @@ CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
|
|||
CONFIG_CLEANCACHE=y
|
||||
CONFIG_FRONTSWAP=y
|
||||
# CONFIG_CMA is not set
|
||||
# CONFIG_MEM_SOFT_DIRTY is not set
|
||||
CONFIG_ZSWAP=y
|
||||
CONFIG_ZPOOL=y
|
||||
CONFIG_ZBUD=y
|
||||
|
|
@ -670,6 +676,7 @@ CONFIG_LEGACY_VSYSCALL_EMULATE=y
|
|||
# CONFIG_CMDLINE_BOOL is not set
|
||||
CONFIG_MODIFY_LDT_SYSCALL=y
|
||||
CONFIG_HAVE_LIVEPATCH=y
|
||||
# CONFIG_LIVEPATCH is not set
|
||||
CONFIG_ARCH_HAS_ADD_PAGES=y
|
||||
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
|
||||
CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
|
||||
|
|
@ -681,6 +688,7 @@ CONFIG_USE_PERCPU_NUMA_NODE_ID=y
|
|||
CONFIG_ARCH_HIBERNATION_HEADER=y
|
||||
CONFIG_SUSPEND=y
|
||||
CONFIG_SUSPEND_FREEZER=y
|
||||
# CONFIG_SUSPEND_SKIP_SYNC is not set
|
||||
CONFIG_HIBERNATE_CALLBACKS=y
|
||||
CONFIG_HIBERNATION=y
|
||||
CONFIG_PM_STD_PARTITION=""
|
||||
|
|
@ -695,6 +703,7 @@ CONFIG_PM_DEBUG=y
|
|||
CONFIG_PM_ADVANCED_DEBUG=y
|
||||
# CONFIG_PM_TEST_SUSPEND is not set
|
||||
CONFIG_PM_SLEEP_DEBUG=y
|
||||
# CONFIG_DPM_WATCHDOG is not set
|
||||
CONFIG_PM_TRACE=y
|
||||
CONFIG_PM_TRACE_RTC=y
|
||||
CONFIG_PM_OPP=y
|
||||
|
|
@ -815,6 +824,7 @@ CONFIG_PCI_DIRECT=y
|
|||
CONFIG_PCI_MMCONFIG=y
|
||||
CONFIG_PCI_XEN=y
|
||||
CONFIG_PCI_DOMAINS=y
|
||||
# CONFIG_PCI_CNB20LE_QUIRK is not set
|
||||
CONFIG_PCIEPORTBUS=y
|
||||
CONFIG_HOTPLUG_PCI_PCIE=y
|
||||
CONFIG_PCIEAER=y
|
||||
|
|
@ -871,6 +881,7 @@ CONFIG_VMD=m
|
|||
# PCI switch controller drivers
|
||||
#
|
||||
CONFIG_PCI_SW_SWITCHTEC=m
|
||||
# CONFIG_ISA_BUS is not set
|
||||
CONFIG_ISA_DMA_API=y
|
||||
CONFIG_AMD_NB=y
|
||||
CONFIG_PCCARD=m
|
||||
|
|
@ -1125,6 +1136,7 @@ CONFIG_NETFILTER_XT_SET=m
|
|||
#
|
||||
# Xtables targets
|
||||
#
|
||||
CONFIG_NETFILTER_XT_TARGET_AUDIT=m
|
||||
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
|
||||
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
|
||||
CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
|
||||
|
|
@ -1732,6 +1744,7 @@ CONFIG_WEXT_PRIV=y
|
|||
CONFIG_CFG80211=m
|
||||
# CONFIG_NL80211_TESTMODE is not set
|
||||
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
|
||||
# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
|
||||
CONFIG_CFG80211_DEFAULT_PS=y
|
||||
# CONFIG_CFG80211_DEBUGFS is not set
|
||||
# CONFIG_CFG80211_INTERNAL_REGDB is not set
|
||||
|
|
@ -2008,6 +2021,7 @@ CONFIG_BLK_DEV_SX8=m
|
|||
CONFIG_BLK_DEV_RAM=m
|
||||
CONFIG_BLK_DEV_RAM_COUNT=16
|
||||
CONFIG_BLK_DEV_RAM_SIZE=16384
|
||||
CONFIG_BLK_DEV_RAM_DAX=y
|
||||
CONFIG_CDROM_PKTCDVD=m
|
||||
CONFIG_CDROM_PKTCDVD_BUFFERS=8
|
||||
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
|
||||
|
|
@ -2384,6 +2398,7 @@ CONFIG_PATA_MPIIX=m
|
|||
CONFIG_PATA_NS87410=m
|
||||
CONFIG_PATA_OPTI=m
|
||||
CONFIG_PATA_PCMCIA=m
|
||||
# CONFIG_PATA_PLATFORM is not set
|
||||
CONFIG_PATA_RZ1000=m
|
||||
|
||||
#
|
||||
|
|
@ -2489,6 +2504,7 @@ CONFIG_NETCONSOLE=m
|
|||
CONFIG_NETCONSOLE_DYNAMIC=y
|
||||
CONFIG_NETPOLL=y
|
||||
CONFIG_NET_POLL_CONTROLLER=y
|
||||
CONFIG_NTB_NETDEV=m
|
||||
CONFIG_TUN=m
|
||||
CONFIG_TAP=m
|
||||
# CONFIG_TUN_VNET_CROSS_LE is not set
|
||||
|
|
@ -2582,7 +2598,8 @@ CONFIG_PCNET32=m
|
|||
CONFIG_PCMCIA_NMCLAN=m
|
||||
CONFIG_AMD_XGBE=m
|
||||
CONFIG_AMD_XGBE_HAVE_ECC=y
|
||||
# CONFIG_NET_VENDOR_AQUANTIA is not set
|
||||
CONFIG_NET_VENDOR_AQUANTIA=y
|
||||
CONFIG_AQTION=m
|
||||
CONFIG_NET_VENDOR_ARC=y
|
||||
CONFIG_NET_VENDOR_ATHEROS=y
|
||||
CONFIG_ATL2=m
|
||||
|
|
@ -2929,6 +2946,7 @@ CONFIG_USB_SIERRA_NET=m
|
|||
CONFIG_USB_VL600=m
|
||||
CONFIG_USB_NET_CH9200=m
|
||||
CONFIG_WLAN=y
|
||||
# CONFIG_WIRELESS_WDS is not set
|
||||
CONFIG_WLAN_VENDOR_ADMTEK=y
|
||||
CONFIG_ADM8211=m
|
||||
CONFIG_ATH_COMMON=m
|
||||
|
|
@ -3054,6 +3072,7 @@ CONFIG_IWLDVM=m
|
|||
CONFIG_IWLMVM=m
|
||||
CONFIG_IWLWIFI_OPMODE_MODULAR=y
|
||||
# CONFIG_IWLWIFI_BCAST_FILTERING is not set
|
||||
# CONFIG_IWLWIFI_PCIE_RTPM is not set
|
||||
|
||||
#
|
||||
# Debugging Options
|
||||
|
|
@ -3383,7 +3402,7 @@ CONFIG_KEYBOARD_GPIO=m
|
|||
# CONFIG_KEYBOARD_SUNKBD is not set
|
||||
# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
|
||||
# CONFIG_KEYBOARD_XTKBD is not set
|
||||
# CONFIG_KEYBOARD_CROS_EC is not set
|
||||
CONFIG_KEYBOARD_CROS_EC=m
|
||||
CONFIG_INPUT_MOUSE=y
|
||||
CONFIG_MOUSE_PS2=m
|
||||
CONFIG_MOUSE_PS2_ALPS=y
|
||||
|
|
@ -3570,6 +3589,8 @@ CONFIG_INPUT_AXP20X_PEK=m
|
|||
CONFIG_INPUT_UINPUT=m
|
||||
CONFIG_INPUT_PCF50633_PMU=m
|
||||
CONFIG_INPUT_PCF8574=m
|
||||
# CONFIG_INPUT_PWM_BEEPER is not set
|
||||
# CONFIG_INPUT_PWM_VIBRA is not set
|
||||
CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
|
||||
CONFIG_INPUT_ADXL34X=m
|
||||
CONFIG_INPUT_ADXL34X_I2C=m
|
||||
|
|
@ -3704,6 +3725,7 @@ CONFIG_SERIAL_RP2_NR_UARTS=32
|
|||
CONFIG_SERIAL_FSL_LPUART=m
|
||||
CONFIG_SERIAL_DEV_BUS=y
|
||||
CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
|
||||
# CONFIG_TTY_PRINTK is not set
|
||||
CONFIG_PRINTER=m
|
||||
# CONFIG_LP_CONSOLE is not set
|
||||
CONFIG_PPDEV=m
|
||||
|
|
@ -3852,7 +3874,7 @@ CONFIG_I2C_VIPERBOARD=m
|
|||
# Other I2C/SMBus bus drivers
|
||||
#
|
||||
# CONFIG_I2C_MLXCPLD is not set
|
||||
# CONFIG_I2C_CROS_EC_TUNNEL is not set
|
||||
CONFIG_I2C_CROS_EC_TUNNEL=m
|
||||
# CONFIG_I2C_STUB is not set
|
||||
CONFIG_I2C_SLAVE=y
|
||||
CONFIG_I2C_SLAVE_EEPROM=m
|
||||
|
|
@ -4335,6 +4357,7 @@ CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
|
|||
CONFIG_SSB_PCMCIAHOST=y
|
||||
CONFIG_SSB_SDIOHOST_POSSIBLE=y
|
||||
CONFIG_SSB_SDIOHOST=y
|
||||
# CONFIG_SSB_SILENT is not set
|
||||
# CONFIG_SSB_DEBUG is not set
|
||||
CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
|
||||
CONFIG_SSB_DRIVER_PCICORE=y
|
||||
|
|
@ -4363,7 +4386,7 @@ CONFIG_MFD_AXP20X=m
|
|||
CONFIG_MFD_AXP20X_I2C=m
|
||||
CONFIG_MFD_CROS_EC=m
|
||||
CONFIG_MFD_CROS_EC_I2C=m
|
||||
# CONFIG_MFD_CROS_EC_SPI is not set
|
||||
CONFIG_MFD_CROS_EC_SPI=m
|
||||
# CONFIG_PMIC_DA903X is not set
|
||||
# CONFIG_MFD_DA9052_SPI is not set
|
||||
# CONFIG_MFD_DA9052_I2C is not set
|
||||
|
|
@ -4485,7 +4508,7 @@ CONFIG_IR_ITE_CIR=m
|
|||
CONFIG_IR_FINTEK=m
|
||||
CONFIG_IR_NUVOTON=m
|
||||
CONFIG_IR_REDRAT3=m
|
||||
# CONFIG_IR_SPI is not set
|
||||
CONFIG_IR_SPI=m
|
||||
CONFIG_IR_STREAMZAP=m
|
||||
CONFIG_IR_WINBOND_CIR=m
|
||||
CONFIG_IR_IGORPLUGUSB=m
|
||||
|
|
@ -4494,6 +4517,7 @@ CONFIG_IR_TTUSBIR=m
|
|||
CONFIG_RC_LOOPBACK=m
|
||||
CONFIG_IR_GPIO_CIR=m
|
||||
CONFIG_IR_GPIO_TX=m
|
||||
CONFIG_IR_PWM_TX=m
|
||||
CONFIG_IR_SERIAL=m
|
||||
CONFIG_IR_SERIAL_TRANSMITTER=y
|
||||
CONFIG_IR_SIR=m
|
||||
|
|
@ -5195,6 +5219,17 @@ CONFIG_DRM_I915_COMPRESS_ERROR=y
|
|||
CONFIG_DRM_I915_USERPTR=y
|
||||
CONFIG_DRM_I915_GVT=y
|
||||
CONFIG_DRM_I915_GVT_KVMGT=m
|
||||
|
||||
#
|
||||
# drm/i915 Debugging
|
||||
#
|
||||
# CONFIG_DRM_I915_WERROR is not set
|
||||
# CONFIG_DRM_I915_DEBUG is not set
|
||||
# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
|
||||
# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
|
||||
# CONFIG_DRM_I915_SELFTEST is not set
|
||||
# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
|
||||
# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
|
||||
CONFIG_DRM_VGEM=m
|
||||
CONFIG_DRM_VMWGFX=m
|
||||
CONFIG_DRM_VMWGFX_FBCON=y
|
||||
|
|
@ -5273,6 +5308,7 @@ CONFIG_FB_EFI=y
|
|||
# CONFIG_FB_RIVA is not set
|
||||
# CONFIG_FB_I740 is not set
|
||||
# CONFIG_FB_LE80578 is not set
|
||||
# CONFIG_FB_INTEL is not set
|
||||
# CONFIG_FB_MATROX is not set
|
||||
# CONFIG_FB_RADEON is not set
|
||||
# CONFIG_FB_ATY128 is not set
|
||||
|
|
@ -5321,13 +5357,16 @@ CONFIG_LCD_PLATFORM=m
|
|||
CONFIG_BACKLIGHT_CLASS_DEVICE=y
|
||||
# CONFIG_BACKLIGHT_GENERIC is not set
|
||||
# CONFIG_BACKLIGHT_LM3533 is not set
|
||||
CONFIG_BACKLIGHT_PWM=m
|
||||
CONFIG_BACKLIGHT_APPLE=m
|
||||
# CONFIG_BACKLIGHT_PM8941_WLED is not set
|
||||
# CONFIG_BACKLIGHT_SAHARA is not set
|
||||
# CONFIG_BACKLIGHT_ADP8860 is not set
|
||||
# CONFIG_BACKLIGHT_ADP8870 is not set
|
||||
# CONFIG_BACKLIGHT_PCF50633 is not set
|
||||
# CONFIG_BACKLIGHT_LM3630A is not set
|
||||
# CONFIG_BACKLIGHT_LM3639 is not set
|
||||
# CONFIG_BACKLIGHT_LP855X is not set
|
||||
# CONFIG_BACKLIGHT_TPS65217 is not set
|
||||
# CONFIG_BACKLIGHT_GPIO is not set
|
||||
# CONFIG_BACKLIGHT_LV5207LP is not set
|
||||
|
|
@ -5866,6 +5905,12 @@ CONFIG_USB_HID=m
|
|||
CONFIG_HID_PID=y
|
||||
CONFIG_USB_HIDDEV=y
|
||||
|
||||
#
|
||||
# USB HID Boot Protocol drivers
|
||||
#
|
||||
# CONFIG_USB_KBD is not set
|
||||
# CONFIG_USB_MOUSE is not set
|
||||
|
||||
#
|
||||
# I2C HID support
|
||||
#
|
||||
|
|
@ -5890,6 +5935,7 @@ CONFIG_USB_DEFAULT_PERSIST=y
|
|||
CONFIG_USB_DYNAMIC_MINORS=y
|
||||
# CONFIG_USB_OTG is not set
|
||||
# CONFIG_USB_OTG_WHITELIST is not set
|
||||
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
|
||||
CONFIG_USB_LEDS_TRIGGER_USBPORT=m
|
||||
CONFIG_USB_MON=m
|
||||
CONFIG_USB_WUSB=m
|
||||
|
|
@ -6184,6 +6230,7 @@ CONFIG_LEDS_PCA955X=m
|
|||
CONFIG_LEDS_PCA955X_GPIO=y
|
||||
CONFIG_LEDS_PCA963X=m
|
||||
# CONFIG_LEDS_DAC124S085 is not set
|
||||
CONFIG_LEDS_PWM=m
|
||||
CONFIG_LEDS_BD2802=m
|
||||
CONFIG_LEDS_INTEL_SS4200=m
|
||||
CONFIG_LEDS_LT3593=m
|
||||
|
|
@ -6891,7 +6938,7 @@ CONFIG_CHROMEOS_LAPTOP=m
|
|||
CONFIG_CHROMEOS_PSTORE=m
|
||||
CONFIG_CROS_EC_CHARDEV=m
|
||||
CONFIG_CROS_EC_LPC=m
|
||||
# CONFIG_CROS_EC_LPC_MEC is not set
|
||||
CONFIG_CROS_EC_LPC_MEC=y
|
||||
CONFIG_CROS_EC_PROTO=y
|
||||
CONFIG_CROS_KBD_LED_BACKLIGHT=m
|
||||
CONFIG_CLKDEV_LOOKUP=y
|
||||
|
|
@ -6905,6 +6952,7 @@ CONFIG_COMMON_CLK=y
|
|||
# CONFIG_COMMON_CLK_CDCE706 is not set
|
||||
# CONFIG_COMMON_CLK_CS2000_CP is not set
|
||||
# CONFIG_COMMON_CLK_NXP is not set
|
||||
# CONFIG_COMMON_CLK_PWM is not set
|
||||
# CONFIG_COMMON_CLK_PXA is not set
|
||||
# CONFIG_COMMON_CLK_PIC32 is not set
|
||||
CONFIG_HWSPINLOCK=m
|
||||
|
|
@ -7228,7 +7276,7 @@ CONFIG_ACPI_ALS=m
|
|||
# CONFIG_CM3232 is not set
|
||||
# CONFIG_CM3323 is not set
|
||||
# CONFIG_CM36651 is not set
|
||||
# CONFIG_IIO_CROS_EC_LIGHT_PROX is not set
|
||||
CONFIG_IIO_CROS_EC_LIGHT_PROX=m
|
||||
# CONFIG_GP2AP020A00F is not set
|
||||
CONFIG_SENSORS_ISL29018=m
|
||||
# CONFIG_SENSORS_ISL29028 is not set
|
||||
|
|
@ -7306,7 +7354,7 @@ CONFIG_IIO_SYSFS_TRIGGER=m
|
|||
#
|
||||
# CONFIG_ABP060MG is not set
|
||||
# CONFIG_BMP280 is not set
|
||||
# CONFIG_IIO_CROS_EC_BARO is not set
|
||||
CONFIG_IIO_CROS_EC_BARO=m
|
||||
CONFIG_HID_SENSOR_PRESS=m
|
||||
# CONFIG_HP03 is not set
|
||||
# CONFIG_MPL115_I2C is not set
|
||||
|
|
@ -7342,9 +7390,24 @@ CONFIG_HID_SENSOR_TEMP=m
|
|||
# CONFIG_TMP007 is not set
|
||||
# CONFIG_TSYS01 is not set
|
||||
# CONFIG_TSYS02D is not set
|
||||
# CONFIG_NTB is not set
|
||||
CONFIG_NTB=m
|
||||
CONFIG_NTB_AMD=m
|
||||
CONFIG_NTB_IDT=m
|
||||
CONFIG_NTB_INTEL=m
|
||||
# CONFIG_NTB_PINGPONG is not set
|
||||
# CONFIG_NTB_TOOL is not set
|
||||
# CONFIG_NTB_PERF is not set
|
||||
CONFIG_NTB_TRANSPORT=m
|
||||
# CONFIG_VME_BUS is not set
|
||||
# CONFIG_PWM is not set
|
||||
CONFIG_PWM=y
|
||||
CONFIG_PWM_SYSFS=y
|
||||
CONFIG_PWM_CRC=y
|
||||
CONFIG_PWM_CROS_EC=m
|
||||
# CONFIG_PWM_LP3943 is not set
|
||||
CONFIG_PWM_LPSS=m
|
||||
CONFIG_PWM_LPSS_PCI=m
|
||||
CONFIG_PWM_LPSS_PLATFORM=m
|
||||
# CONFIG_PWM_PCA9685 is not set
|
||||
CONFIG_ARM_GIC_MAX_NR=1
|
||||
# CONFIG_IPACK_BUS is not set
|
||||
CONFIG_RESET_CONTROLLER=y
|
||||
|
|
@ -7399,7 +7462,7 @@ CONFIG_BTT=y
|
|||
CONFIG_ND_PFN=m
|
||||
CONFIG_NVDIMM_PFN=y
|
||||
CONFIG_NVDIMM_DAX=y
|
||||
CONFIG_DAX=m
|
||||
CONFIG_DAX=y
|
||||
CONFIG_DEV_DAX=m
|
||||
CONFIG_DEV_DAX_PMEM=m
|
||||
CONFIG_NVMEM=y
|
||||
|
|
@ -7420,10 +7483,7 @@ CONFIG_INTEL_TH_PTI=m
|
|||
#
|
||||
# FSI support
|
||||
#
|
||||
CONFIG_FSI=m
|
||||
CONFIG_FSI_MASTER_GPIO=m
|
||||
CONFIG_FSI_MASTER_HUB=m
|
||||
CONFIG_FSI_SCOM=m
|
||||
# CONFIG_FSI is not set
|
||||
|
||||
#
|
||||
# Firmware Drivers
|
||||
|
|
@ -7453,7 +7513,7 @@ CONFIG_EFI_RUNTIME_WRAPPERS=y
|
|||
CONFIG_EFI_CAPSULE_LOADER=m
|
||||
# CONFIG_EFI_TEST is not set
|
||||
CONFIG_APPLE_PROPERTIES=y
|
||||
CONFIG_RESET_ATTACK_MITIGATION=y
|
||||
# CONFIG_RESET_ATTACK_MITIGATION is not set
|
||||
CONFIG_UEFI_CPER=y
|
||||
CONFIG_EFI_DEV_PATH_PARSER=y
|
||||
|
||||
|
|
@ -7519,7 +7579,8 @@ CONFIG_F2FS_CHECK_FS=y
|
|||
CONFIG_F2FS_FS_ENCRYPTION=y
|
||||
# CONFIG_F2FS_IO_TRACE is not set
|
||||
# CONFIG_F2FS_FAULT_INJECTION is not set
|
||||
# CONFIG_FS_DAX is not set
|
||||
CONFIG_FS_DAX=y
|
||||
CONFIG_FS_DAX_PMD=y
|
||||
CONFIG_FS_POSIX_ACL=y
|
||||
CONFIG_EXPORTFS=y
|
||||
CONFIG_EXPORTFS_BLOCK_OPS=y
|
||||
|
|
@ -7576,7 +7637,7 @@ CONFIG_MSDOS_FS=m
|
|||
CONFIG_VFAT_FS=m
|
||||
CONFIG_FAT_DEFAULT_CODEPAGE=437
|
||||
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
|
||||
# CONFIG_FAT_DEFAULT_UTF8 is not set
|
||||
CONFIG_FAT_DEFAULT_UTF8=y
|
||||
CONFIG_NTFS_FS=m
|
||||
# CONFIG_NTFS_DEBUG is not set
|
||||
CONFIG_NTFS_RW=y
|
||||
|
|
@ -7882,7 +7943,7 @@ CONFIG_PANIC_TIMEOUT=0
|
|||
CONFIG_SCHED_DEBUG=y
|
||||
CONFIG_SCHED_INFO=y
|
||||
CONFIG_SCHEDSTATS=y
|
||||
# CONFIG_SCHED_STACK_END_CHECK is not set
|
||||
CONFIG_SCHED_STACK_END_CHECK=y
|
||||
# CONFIG_DEBUG_TIMEKEEPING is not set
|
||||
# CONFIG_DEBUG_PREEMPT is not set
|
||||
|
||||
|
|
@ -7970,10 +8031,11 @@ CONFIG_FUNCTION_PROFILER=y
|
|||
CONFIG_FTRACE_MCOUNT_RECORD=y
|
||||
# CONFIG_FTRACE_STARTUP_TEST is not set
|
||||
CONFIG_MMIOTRACE=y
|
||||
# CONFIG_HIST_TRIGGERS is not set
|
||||
CONFIG_TRACING_MAP=y
|
||||
CONFIG_HIST_TRIGGERS=y
|
||||
# CONFIG_MMIOTRACE_TEST is not set
|
||||
# CONFIG_TRACEPOINT_BENCHMARK is not set
|
||||
CONFIG_RING_BUFFER_BENCHMARK=m
|
||||
# CONFIG_RING_BUFFER_BENCHMARK is not set
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
# CONFIG_TRACE_EVAL_MAP_FILE is not set
|
||||
CONFIG_TRACING_EVENTS_GPIO=y
|
||||
|
|
@ -8054,6 +8116,7 @@ CONFIG_OPTIMIZE_INLINING=y
|
|||
# CONFIG_PUNIT_ATOM_DEBUG is not set
|
||||
# CONFIG_FRAME_POINTER_UNWINDER is not set
|
||||
CONFIG_ORC_UNWINDER=y
|
||||
# CONFIG_GUESS_UNWINDER is not set
|
||||
|
||||
#
|
||||
# Security options
|
||||
|
|
@ -8070,11 +8133,12 @@ CONFIG_SECURITY=y
|
|||
# CONFIG_SECURITY_WRITABLE_HOOKS is not set
|
||||
CONFIG_SECURITYFS=y
|
||||
# CONFIG_SECURITY_NETWORK is not set
|
||||
CONFIG_SECURITY_INFINIBAND=y
|
||||
CONFIG_SECURITY_PATH=y
|
||||
# CONFIG_SECURITY_INFINIBAND is not set
|
||||
# CONFIG_SECURITY_PATH is not set
|
||||
# CONFIG_INTEL_TXT is not set
|
||||
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
|
||||
CONFIG_HARDENED_USERCOPY=y
|
||||
# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
|
||||
CONFIG_FORTIFY_SOURCE=y
|
||||
# CONFIG_STATIC_USERMODEHELPER is not set
|
||||
# CONFIG_SECURITY_SMACK is not set
|
||||
|
|
@ -8084,6 +8148,7 @@ CONFIG_FORTIFY_SOURCE=y
|
|||
CONFIG_SECURITY_YAMA=y
|
||||
CONFIG_INTEGRITY=y
|
||||
# CONFIG_INTEGRITY_SIGNATURE is not set
|
||||
CONFIG_INTEGRITY_AUDIT=y
|
||||
# CONFIG_IMA is not set
|
||||
# CONFIG_EVM is not set
|
||||
CONFIG_DEFAULT_SECURITY_DAC=y
|
||||
|
|
@ -8369,11 +8434,11 @@ CONFIG_ZSTD_COMPRESS=m
|
|||
CONFIG_ZSTD_DECOMPRESS=m
|
||||
CONFIG_XZ_DEC=y
|
||||
CONFIG_XZ_DEC_X86=y
|
||||
CONFIG_XZ_DEC_POWERPC=y
|
||||
CONFIG_XZ_DEC_IA64=y
|
||||
CONFIG_XZ_DEC_ARM=y
|
||||
CONFIG_XZ_DEC_ARMTHUMB=y
|
||||
CONFIG_XZ_DEC_SPARC=y
|
||||
# CONFIG_XZ_DEC_POWERPC is not set
|
||||
# CONFIG_XZ_DEC_IA64 is not set
|
||||
# CONFIG_XZ_DEC_ARM is not set
|
||||
# CONFIG_XZ_DEC_ARMTHUMB is not set
|
||||
# CONFIG_XZ_DEC_SPARC is not set
|
||||
CONFIG_XZ_DEC_BCJ=y
|
||||
# CONFIG_XZ_DEC_TEST is not set
|
||||
CONFIG_DECOMPRESS_GZIP=y
|
||||
|
|
|
|||
Loading…
Reference in New Issue