Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Browse source

Pull security subsystem fixes from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  KEYS: remove a bogus NULL check
  ima: Fix build failure on powerpc when TCG_IBMVTPM dependencies are not met
  KEYS: Fix stale key registration at error path

...

This commit is contained in:

Linus Torvalds 2014-12-17 09:52:49 -08:00

parent c103b21c20 5057975ae3

commit 5f5425ef55

3 changed files with 9 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

security/integrity/ima/Kconfig

View file

5

security/keys/encrypted-keys/encrypted.c

View file

10

security/keys/key.c

View file