Linus Torvalds
0302e28dee
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security ...
Pull security subsystem updates from James Morris:
"Highlights:
IMA:
- provide ">" and "<" operators for fowner/uid/euid rules
KEYS:
- add a system blacklist keyring
- add KEYCTL_RESTRICT_KEYRING, exposes keyring link restriction
functionality to userland via keyctl()
LSM:
- harden LSM API with __ro_after_init
- add prlmit security hook, implement for SELinux
- revive security_task_alloc hook
TPM:
- implement contextual TPM command 'spaces'"
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (98 commits)
tpm: Fix reference count to main device
tpm_tis: convert to using locality callbacks
tpm: fix handling of the TPM 2.0 event logs
tpm_crb: remove a cruft constant
keys: select CONFIG_CRYPTO when selecting DH / KDF
apparmor: Make path_max parameter readonly
apparmor: fix parameters so that the permission test is bypassed at boot
apparmor: fix invalid reference to index variable of iterator line 836
apparmor: use SHASH_DESC_ON_STACK
security/apparmor/lsm.c: set debug messages
apparmor: fix boolreturn.cocci warnings
Smack: Use GFP_KERNEL for smk_netlbl_mls().
smack: fix double free in smack_parse_opts_str()
KEYS: add SP800-56A KDF support for DH
KEYS: Keyring asymmetric key restrict method with chaining
KEYS: Restrict asymmetric key linkage using a specific keychain
KEYS: Add a lookup_restriction function for the asymmetric key type
KEYS: Add KEYCTL_RESTRICT_KEYRING
KEYS: Consistent ordering for __key_link_begin and restrict check
KEYS: Add an optional lookup_restriction hook to key_type
...
2017-05-03 08:50:52 -07:00
Merge branch 'linus' into WIP.x86/boot, to fix up conflicts and to pick up updates
2017-03-01 09:02:26 +01:00
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2017-05-02 15:53:46 -07:00
ipmi/watchdog: fix wdog hang on panic waiting for ipmi response
2017-04-28 14:53:17 -05:00
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
lib/vsprintf.c: remove %Z support
2017-02-27 18:43:47 -08:00
tpm: Fix reference count to main device
2017-04-25 00:27:18 +03:00
char: xilinx_hwicap: Remove pointless local variables
2017-01-25 11:41:44 +01:00
char: xillybus: Fix spelling mistake and comment
2016-08-31 14:47:54 +02:00
apm-emulation: move APM_MINOR_DEV to include/linux/miscdevice.h
2017-01-10 21:46:41 +01:00
sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>
2017-03-02 08:42:32 +01:00
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
ds1302: remove unneeded linux/miscdevice.h include
2017-01-10 21:46:41 +01:00
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
dsp56k: prevent a harmless underflow
2016-07-14 16:21:53 +09:00
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
drivers/char: make efirtc.c driver explicitly non-modular
2015-09-20 19:32:35 -07:00
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>
2017-03-02 08:42:32 +01:00
TTY/Serial driver patches for 4.11-rc1
2017-02-22 12:17:25 -08:00
sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>
2017-03-02 08:42:32 +01:00
RTC for 4.8
2016-08-05 09:48:22 -04:00
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
mm: Tighten x86 /dev/mem with zeroing reads
2017-04-12 11:40:23 -07:00
char: make misc_deregister a void function
2015-08-05 10:35:49 -07:00
time: Change k_clock timer_set() and timer_get() to use timespec64
2017-04-14 21:49:56 +02:00
mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf
2017-02-24 17:46:54 -08:00
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
char/nvram: set array of const as const
2016-02-08 14:57:30 -08:00
drivers/char/nwbutton: Fix build breakage caused by include file reshuffling
2017-03-07 08:35:49 +01:00
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
powerpc/powernv: Add driver for operator panel on FSP machines
2016-06-29 17:33:46 +10:00
ppdev: fix registering same device name
2017-03-16 17:32:21 +09:00
wrappers for ->i_mutex access
2016-01-22 18:04:28 -05:00
random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block
2017-02-06 20:46:49 -05:00
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>
2017-03-02 08:42:32 +01:00
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>
2017-03-02 08:42:32 +01:00
sched/headers: Prepare for new header dependencies before moving code to <linux/sched/signal.h>
2017-03-02 08:42:29 +01:00
scripts/spelling.txt: add "initialiazation" pattern and fix typo instances
2017-02-27 18:43:47 -08:00
mips: separate extable.h, switch module.h to it
2016-10-05 18:36:18 -04:00
tile-srom: allow the driver to be built as a module
2016-11-10 15:18:56 +01:00
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
2016-12-24 11:46:01 -08:00
ttyprintk: Neaten and simplify printing
2016-09-13 17:30:17 +02:00
virtio_console: fix uninitialized variable use
2017-04-07 16:39:00 +03:00
0302e28dee