Linus Torvalds 32627645e9 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
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()
  ...
2017-06-11 16:17:29 -07:00
..
2017-04-12 18:51:01 +02:00
2017-04-21 10:45:01 -04:00
2017-05-08 19:03:25 -07:00
2017-05-11 10:44:22 -07:00
2016-12-14 10:49:33 -08:00
2017-05-11 11:12:26 -07:00
2017-05-10 15:33:45 +02:00
2017-05-09 15:15:47 -07:00
2017-05-09 15:15:47 -07:00
2016-12-22 22:58:37 -05:00
2017-04-28 18:09:59 -04:00
2017-05-01 14:09:21 -07:00
2017-02-10 15:52:24 -05:00
2017-01-25 13:17:47 -05:00
2017-04-11 14:38:43 -04:00
2017-04-26 23:54:06 -04:00
2017-03-30 09:37:20 +02:00
2017-05-24 12:43:30 -04:00
2017-04-18 20:41:12 +02:00
2016-12-05 19:01:16 -05:00
2017-05-05 18:49:20 -07:00
2016-10-28 08:48:16 -06:00
2017-04-10 17:15:02 +02:00
2017-04-27 05:13:04 -04:00
2016-12-05 19:01:16 -05:00
2017-05-25 13:44:28 -04:00
2017-05-12 15:57:15 -07:00
2016-12-25 17:21:22 +01:00
2017-03-21 10:15:47 +02:00
2017-04-05 18:11:48 +02:00
2017-05-04 19:15:35 -07:00
2017-02-11 20:59:41 -05:00
2017-05-08 17:15:12 -07:00
2017-01-05 15:01:55 -06:00
2017-05-03 15:52:10 -07:00
2016-12-12 18:55:06 -08:00
2016-12-25 17:21:23 +01:00
2017-02-24 17:46:57 -08:00
2016-12-06 11:05:46 +01:00
2017-05-03 19:12:27 -07:00
2017-04-24 14:30:46 -04:00
2017-01-12 16:48:26 -05:00
2017-02-23 11:53:22 -08:00
2016-11-16 18:32:02 -05:00
2017-05-10 13:03:38 -07:00
2017-04-26 13:03:04 -04:00
2017-05-09 15:15:47 -07:00
2017-05-05 11:36:44 -07:00
2016-12-06 10:17:03 +02:00
2017-05-26 10:51:18 -07:00
2016-10-31 16:18:30 -04:00
2016-10-14 11:36:59 -07:00
2017-05-09 10:01:15 -07:00
2016-12-13 11:42:18 -08:00
2016-12-13 16:07:55 -08:00
2017-03-07 14:01:02 -08:00
2017-05-09 16:43:23 +03:00
2017-02-13 21:44:09 -05:00
2017-03-28 08:54:48 +02:00
2017-05-03 15:52:10 -07:00
2017-05-05 18:16:23 -07:00
2017-05-08 17:15:12 -07:00
2017-03-26 15:09:45 +02:00
2017-01-09 16:07:38 -05:00
2016-12-26 23:53:46 -05:00
2017-03-22 12:15:15 -07:00
2017-05-05 18:49:20 -07:00
2017-03-09 15:42:33 +01:00
2017-01-10 18:31:55 -08:00
2017-02-10 16:34:17 +00:00
2017-05-09 16:43:22 +03:00