# git rev-parse -q --verify aefcf2f4b58155d27340ba5f9ddbe9513da8286d^{commit} aefcf2f4b58155d27340ba5f9ddbe9513da8286d already have revision, skipping fetch # git checkout -q -f -B kisskb aefcf2f4b58155d27340ba5f9ddbe9513da8286d # git clean -qxdf # < git log -1 # commit aefcf2f4b58155d27340ba5f9ddbe9513da8286d # Merge: f1f2f614d535 45893a0abee6 # Author: Linus Torvalds # Date: Sat Sep 28 08:14:15 2019 -0700 # # Merge branch 'next-lockdown' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security # # Pull kernel lockdown mode from James Morris: # "This is the latest iteration of the kernel lockdown patchset, from # Matthew Garrett, David Howells and others. # # From the original description: # # This patchset introduces an optional kernel lockdown feature, # intended to strengthen the boundary between UID 0 and the kernel. # When enabled, various pieces of kernel functionality are restricted. # Applications that rely on low-level access to either hardware or the # kernel may cease working as a result - therefore this should not be # enabled without appropriate evaluation beforehand. # # The majority of mainstream distributions have been carrying variants # of this patchset for many years now, so there's value in providing a # doesn't meet every distribution requirement, but gets us much closer # to not requiring external patches. # # There are two major changes since this was last proposed for mainline: # # - Separating lockdown from EFI secure boot. Background discussion is # covered here: https://lwn.net/Articles/751061/ # # - Implementation as an LSM, with a default stackable lockdown LSM # module. This allows the lockdown feature to be policy-driven, # rather than encoding an implicit policy within the mechanism. # # The new locked_down LSM hook is provided to allow LSMs to make a # policy decision around whether kernel functionality that would allow # tampering with or examining the runtime state of the kernel should be # permitted. # # The included lockdown LSM provides an implementation with a simple # policy intended for general purpose use. This policy provides a coarse # level of granularity, controllable via the kernel command line: # # lockdown={integrity|confidentiality} # # Enable the kernel lockdown feature. If set to integrity, kernel features # that allow userland to modify the running kernel are disabled. If set to # confidentiality, kernel features that allow userland to extract # confidential information from the kernel are also disabled. # # This may also be controlled via /sys/kernel/security/lockdown and # overriden by kernel configuration. # # New or existing LSMs may implement finer-grained controls of the # lockdown features. Refer to the lockdown_reason documentation in # include/linux/security.h for details. # # The lockdown feature has had signficant design feedback and review # across many subsystems. This code has been in linux-next for some # weeks, with a few fixes applied along the way. # # Stephen Rothwell noted that commit 9d1f8be5cf42 ("bpf: Restrict bpf # when kernel lockdown is in confidentiality mode") is missing a # Signed-off-by from its author. Matthew responded that he is providing # this under category (c) of the DCO" # # * 'next-lockdown' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (31 commits) # kexec: Fix file verification on S390 # security: constify some arrays in lockdown LSM # lockdown: Print current->comm in restriction messages # efi: Restrict efivar_ssdt_load when the kernel is locked down # tracefs: Restrict tracefs when the kernel is locked down # debugfs: Restrict debugfs when the kernel is locked down # kexec: Allow kexec_file() with appropriate IMA policy when locked down # lockdown: Lock down perf when in confidentiality mode # bpf: Restrict bpf when kernel lockdown is in confidentiality mode # lockdown: Lock down tracing and perf kprobes when in confidentiality mode # lockdown: Lock down /proc/kcore # x86/mmiotrace: Lock down the testmmiotrace module # lockdown: Lock down module params that specify hardware parameters (eg. ioport) # lockdown: Lock down TIOCSSERIAL # lockdown: Prohibit PCMCIA CIS storage when the kernel is locked down # acpi: Disable ACPI table override if the kernel is locked down # acpi: Ignore acpi_rsdp kernel param when the kernel has been locked down # ACPI: Limit access to custom_method when the kernel is locked down # x86/msr: Restrict MSR access when the kernel is locked down # x86: Lock down IO port access when the kernel is locked down # ... # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux-ld --version # < git log --format=%s --max-count=1 aefcf2f4b58155d27340ba5f9ddbe9513da8286d # < make -s -j 48 ARCH=s390 O=/kisskb/build/linus_s390-allmodconfig_s390x-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # yes \n | make -s -j 48 ARCH=s390 O=/kisskb/build/linus_s390-allmodconfig_s390x-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux- oldconfig yes: standard output: Broken pipe # make -s -j 48 ARCH=s390 O=/kisskb/build/linus_s390-allmodconfig_s390x-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux- In file included from /kisskb/src/include/linux/kernel.h:15, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/wait.h:7, from /kisskb/src/include/linux/wait_bit.h:8, from /kisskb/src/include/linux/fs.h:6, from /kisskb/src/fs/ubifs/ubifs.h:16, from /kisskb/src/fs/ubifs/orphan.c:10: /kisskb/src/fs/ubifs/orphan.c: In function 'orphan_delete': /kisskb/src/fs/ubifs/debug.h:158:11: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'ino_t' {aka 'unsigned int'} [-Wformat=] pr_debug("UBIFS DBG " type " (pid %d): " fmt "\n", current->pid, \ ^~~~~~~~~~~~ /kisskb/src/include/linux/printk.h:288:21: note: in definition of macro 'pr_fmt' #define pr_fmt(fmt) fmt ^~~ /kisskb/src/include/linux/dynamic_debug.h:143:2: note: in expansion of macro '__dynamic_func_call' __dynamic_func_call(__UNIQUE_ID(ddebug), fmt, func, ##__VA_ARGS__) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/dynamic_debug.h:153:2: note: in expansion of macro '_dynamic_func_call' _dynamic_func_call(fmt, __dynamic_pr_debug, \ ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/printk.h:336:2: note: in expansion of macro 'dynamic_pr_debug' dynamic_pr_debug(fmt, ##__VA_ARGS__) ^~~~~~~~~~~~~~~~ /kisskb/src/fs/ubifs/debug.h:158:2: note: in expansion of macro 'pr_debug' pr_debug("UBIFS DBG " type " (pid %d): " fmt "\n", current->pid, \ ^~~~~~~~ /kisskb/src/fs/ubifs/debug.h:170:29: note: in expansion of macro 'ubifs_dbg_msg' #define dbg_gen(fmt, ...) ubifs_dbg_msg("gen", fmt, ##__VA_ARGS__) ^~~~~~~~~~~~~ /kisskb/src/fs/ubifs/orphan.c:132:3: note: in expansion of macro 'dbg_gen' dbg_gen("deleted twice ino %lu", orph->inum); ^~~~~~~ /kisskb/src/fs/ubifs/orphan.c:132:32: note: format string is defined here dbg_gen("deleted twice ino %lu", orph->inum); ~~^ %u In file included from /kisskb/src/include/linux/kernel.h:15, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/wait.h:7, from /kisskb/src/include/linux/wait_bit.h:8, from /kisskb/src/include/linux/fs.h:6, from /kisskb/src/fs/ubifs/ubifs.h:16, from /kisskb/src/fs/ubifs/orphan.c:10: /kisskb/src/fs/ubifs/debug.h:158:11: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'ino_t' {aka 'unsigned int'} [-Wformat=] pr_debug("UBIFS DBG " type " (pid %d): " fmt "\n", current->pid, \ ^~~~~~~~~~~~ /kisskb/src/include/linux/printk.h:288:21: note: in definition of macro 'pr_fmt' #define pr_fmt(fmt) fmt ^~~ /kisskb/src/include/linux/dynamic_debug.h:143:2: note: in expansion of macro '__dynamic_func_call' __dynamic_func_call(__UNIQUE_ID(ddebug), fmt, func, ##__VA_ARGS__) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/dynamic_debug.h:153:2: note: in expansion of macro '_dynamic_func_call' _dynamic_func_call(fmt, __dynamic_pr_debug, \ ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/printk.h:336:2: note: in expansion of macro 'dynamic_pr_debug' dynamic_pr_debug(fmt, ##__VA_ARGS__) ^~~~~~~~~~~~~~~~ /kisskb/src/fs/ubifs/debug.h:158:2: note: in expansion of macro 'pr_debug' pr_debug("UBIFS DBG " type " (pid %d): " fmt "\n", current->pid, \ ^~~~~~~~ /kisskb/src/fs/ubifs/debug.h:170:29: note: in expansion of macro 'ubifs_dbg_msg' #define dbg_gen(fmt, ...) ubifs_dbg_msg("gen", fmt, ##__VA_ARGS__) ^~~~~~~~~~~~~ /kisskb/src/fs/ubifs/orphan.c:140:3: note: in expansion of macro 'dbg_gen' dbg_gen("delete later ino %lu", orph->inum); ^~~~~~~ /kisskb/src/fs/ubifs/orphan.c:140:31: note: format string is defined here dbg_gen("delete later ino %lu", orph->inum); ~~^ %u /kisskb/src/lib/test_kasan.c: In function 'kasan_alloca_oob_left': /kisskb/src/lib/test_kasan.c:527:1: warning: 'kasan_alloca_oob_left' uses dynamic stack allocation } ^ /kisskb/src/lib/test_kasan.c: In function 'kasan_alloca_oob_right': /kisskb/src/lib/test_kasan.c:537:1: warning: 'kasan_alloca_oob_right' uses dynamic stack allocation } ^ /kisskb/src/drivers/input/joystick/analog.c:160:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^~~~~~~ In file included from /kisskb/src/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c:40: /kisskb/src/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c: In function 'mvpp2_setup_bm_pool': /kisskb/src/drivers/net/ethernet/marvell/mvpp2/mvpp2.h:634:2: warning: overflow in conversion from 'long unsigned int' to 'int' changes value from '18446744073709551584' to '-32' [-Woverflow] ((total_size) - NET_SKB_PAD - MVPP2_SKB_SHINFO_SIZE) ^ /kisskb/src/drivers/net/ethernet/marvell/mvpp2/mvpp2.h:699:33: note: in expansion of macro 'MVPP2_RX_MAX_PKT_SIZE' #define MVPP2_BM_SHORT_PKT_SIZE MVPP2_RX_MAX_PKT_SIZE(MVPP2_BM_SHORT_FRAME_SIZE) ^~~~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c:577:41: note: in expansion of macro 'MVPP2_BM_SHORT_PKT_SIZE' mvpp2_pools[MVPP2_BM_SHORT].pkt_size = MVPP2_BM_SHORT_PKT_SIZE; ^~~~~~~~~~~~~~~~~~~~~~~ Completed OK # rm -rf /kisskb/build/linus_s390-allmodconfig_s390x-gcc8 # Build took: 0:17:10.347649