# 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/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi-gcc --version # < /opt/cross/kisskb/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi-ld --version # < git log --format=%s --max-count=1 aefcf2f4b58155d27340ba5f9ddbe9513da8286d # < make -s -j 48 ARCH=arm O=/kisskb/build/linus_multi_v7_defconfig_arm CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi- multi_v7_defconfig arch/arm/configs/multi_v7_defconfig:936:warning: symbol value 'm' invalid for REMOTEPROC # make -s -j 48 ARCH=arm O=/kisskb/build/linus_multi_v7_defconfig_arm CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi- /kisskb/src/arch/arm/crypto/Makefile:27: These CRC Extensions modules need binutils 2.23 or higher /kisskb/src/arch/arm/crypto/Makefile:28: crc32-arm-ce.o /kisskb/src/arch/arm/crypto/Makefile:37: These ARMv8 Crypto Extensions modules need binutils 2.23 or higher /kisskb/src/arch/arm/crypto/Makefile:38: aes-arm-ce.o sha1-arm-ce.o sha2-arm-ce.o ghash-arm-ce.o /kisskb/src/kernel/printk/printk.c: In function 'devkmsg_sysctl_set_loglvl': /kisskb/src/kernel/printk/printk.c:204:16: warning: 'old' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/kernel/rcu/srcutree.c: In function 'init_srcu_struct_fields': /kisskb/src/kernel/rcu/srcutree.c:140:32: warning: 'levelspread[]' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/kernel/rcu/srcutree.c:88:6: note: 'levelspread[]' was declared here /kisskb/src/sound/hda/hdac_regmap.c: In function 'hda_reg_write': /kisskb/src/sound/hda/hdac_regmap.c:284:16: warning: 'err' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/base/regmap/regmap.c: In function 'regmap_raw_read': /kisskb/src/drivers/base/regmap/regmap.c:2591:6: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/base/regmap/regmap.c: In function '_regmap_raw_write': /kisskb/src/drivers/base/regmap/regmap.c:1852:6: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/crypto/sha512_generic.c: In function 'sha512_transform': /kisskb/src/crypto/sha512_generic.c:149:1: warning: the frame size of 1184 bytes is larger than 1024 bytes [-Wframe-larger-than=] /kisskb/src/fs/proc/inode.c: In function 'proc_reg_open': /kisskb/src/include/linux/list.h:65:12: warning: 'pdeo' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c:338:21: note: 'pdeo' was declared here /kisskb/src/sound/soc/soc-pcm.c: In function 'soc_pcm_trigger': /kisskb/src/sound/soc/soc-pcm.c:1074:5: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/sound/soc/soc-pcm.c: In function 'soc_pcm_bespoke_trigger': /kisskb/src/sound/soc/soc-pcm.c:1092:9: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/net/core/devlink.c: In function 'devlink_fmsg_prepare_skb': /kisskb/src/net/core/devlink.c:4484:6: warning: 'err' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/clk/sunxi-ng/ccu_mux.c: In function 'ccu_mux_helper_determine_rate': /kisskb/src/drivers/clk/sunxi-ng/ccu_mux.c:150:22: warning: 'best_parent' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/i2c/busses/i2c-sh_mobile.c: In function 'sh_mobile_i2c_isr': /kisskb/src/drivers/i2c/busses/i2c-sh_mobile.c:399:26: warning: 'data' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/i2c/busses/i2c-sh_mobile.c:372:16: note: 'data' was declared here /kisskb/src/net/mac80211/mlme.c: In function 'ieee80211_rx_mgmt_beacon': /kisskb/src/net/mac80211/mlme.c:1576:3: warning: 'pwr_level_cisco' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/net/mac80211/mlme.c:1533:6: note: 'pwr_level_cisco' was declared here /kisskb/src/drivers/clk/ti/clk.c: In function 'omap2_clk_for_each': /kisskb/src/drivers/clk/ti/clk.c:579:2: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/gpu/drm/sun4i/sun4i_tcon.c: In function 'sun4i_tcon_bind': /kisskb/src/drivers/gpu/drm/sun4i/sun4i_tcon.c:1178:35: warning: 'has_lvds_alt' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/soc/qcom/wcnss_ctrl.c: In function 'wcnss_async_probe': /kisskb/src/drivers/soc/qcom/wcnss_ctrl.c:299:5: warning: 'expect_cbc' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c: In function 'get_scale_config': /kisskb/src/drivers/gpu/drm/msm/disp/mdp5/mdp5.xml.h:1036:16: warning: 'uv_filter' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c:697:22: note: 'uv_filter' was declared here /kisskb/src/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c: In function 'sun6i_dsi_encoder_enable': /kisskb/src/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c:721:8: warning: missing braces around initializer [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c:721:8: warning: (near initialization for 'opts.mipi_dphy') [-Wmissing-braces] /kisskb/src/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c: In function 'stmmac_open': /kisskb/src/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:1020:12: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:1010:6: note: 'ret' was declared here /kisskb/src/drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c: In function 'gk104_top_oneinit': /kisskb/src/drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c:104:1: warning: 'inst' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c:104:1: warning: 'type' may be used uninitialized in this function [-Wuninitialized] WARNING: "return_address" [vmlinux] is a static EXPORT_SYMBOL_GPL WARNING: "return_address" [vmlinux] is a static EXPORT_SYMBOL_GPL Completed OK # rm -rf /kisskb/build/linus_multi_v7_defconfig_arm # Build took: 0:02:53.853917