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

Pull key subsystem fixes from James Morris:
 "Here are a bunch of fixes for Linux keyrings, including:

   - Fix up the refcount handling now that key structs use the
     refcount_t type and the refcount_t ops don't allow a 0->1
     transition.

   - Fix a potential NULL deref after error in x509_cert_parse().

   - Don't put data for the crypto algorithms to use on the stack.

   - Fix the handling of a null payload being passed to add_key().

   - Fix incorrect cleanup an uninitialised key_preparsed_payload in
     key_update().

   - Explicit sanitisation of potentially secure data before freeing.

   - Fixes for the Diffie-Helman code"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (23 commits)
  KEYS: fix refcount_inc() on zero
  KEYS: Convert KEYCTL_DH_COMPUTE to use the crypto KPP API
  crypto : asymmetric_keys : verify_pefile:zero memory content before freeing
  KEYS: DH: add __user annotations to keyctl_kdf_params
  KEYS: DH: ensure the KDF counter is properly aligned
  KEYS: DH: don't feed uninitialized "otherinfo" into KDF
  KEYS: DH: forbid using digest_null as the KDF hash
  KEYS: sanitize key structs before freeing
  KEYS: trusted: sanitize all key material
  KEYS: encrypted: sanitize all key material
  KEYS: user_defined: sanitize key payloads
  KEYS: sanitize add_key() and keyctl() key payloads
  KEYS: fix freeing uninitialized memory in key_update()
  KEYS: fix dereferencing NULL payload with nonzero length
  KEYS: encrypted: use constant-time HMAC comparison
  KEYS: encrypted: fix race causing incorrect HMAC calculations
  KEYS: encrypted: fix buffer overread in valid_master_desc()
  KEYS: encrypted: avoid encrypting/decrypting stack buffers
  KEYS: put keyring if install_session_keyring_to_cred() fails
  KEYS: Delete an error message for a failed memory allocation in get_derived_key()
  ...

diff --combined arch/powerpc/Kconfig
index 964da1891ea9cc6b5dc174131db1c7bbdc2f07f4,83d2e0f43c2628b5dc25d561085b58d8023f58b1..bf4391d189233847a7cc82a5623fa5fd3bf30a31
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -380,6 -380,22 +380,6 @@@ source "arch/powerpc/platforms/Kconfig
  
  menu "Kernel options"
  
 -config PPC_DT_CPU_FTRS
 -      bool "Device-tree based CPU feature discovery & setup"
 -      depends on PPC_BOOK3S_64
 -      default n
 -      help
 -        This enables code to use a new device tree binding for describing CPU
 -        compatibility and features. Saying Y here will attempt to use the new
 -        binding if the firmware provides it. Currently only the skiboot
 -        firmware provides this binding.
 -        If you're not sure say Y.
 -
 -config PPC_CPUFEATURES_ENABLE_UNKNOWN
 -      bool "cpufeatures pass through unknown features to guest/userspace"
 -      depends on PPC_DT_CPU_FTRS
 -      default y
 -
  config HIGHMEM
        bool "High memory support"
        depends on PPC32
@@@ -1199,11 -1215,6 +1199,6 @@@ source "arch/powerpc/Kconfig.debug
  
  source "security/Kconfig"
  
- config KEYS_COMPAT
-       bool
-       depends on COMPAT && KEYS
-       default y
- 
  source "crypto/Kconfig"
  
  config PPC_LIB_RHEAP