Merge remote-tracking branch 'security/next'

diff --cc MAINTAINERS
Simple merge

diff --cc crypto/asymmetric_keys/x509_public_key.c
Simple merge

diff --cc fs/cifs/connect.c
Simple merge

diff --cc fs/cifs/smb2pdu.c
Simple merge

diff --cc fs/ext4/crypto_key.c
index f9270ec2a1325cce3ae87ab69dc36481fef2ca5c,5c52c79dea4625c4a73d7d6195da9c1e39d6f02b..c5882b36e5582d0005582d0fe3ac86cab70d9c9c
--- 1/fs/ext4/crypto_key.c
--- 2/fs/ext4/crypto_key.c
+++ b/fs/ext4/crypto_key.c
@@@ -207,13 -208,8 +207,13 @@@ retry
                goto out;
        }
        crypt_info->ci_keyring_key = keyring_key;
 -      BUG_ON(keyring_key->type != &key_type_logon);
 +      if (keyring_key->type != &key_type_logon) {
 +              printk_once(KERN_WARNING
 +                          "ext4: key type must be logon\n");
 +              res = -ENOKEY;
 +              goto out;
 +      }
-       ukp = ((struct user_key_payload *)keyring_key->payload.data);
+       ukp = user_key_payload(keyring_key);
        if (ukp->datalen != sizeof(struct ext4_encryption_key)) {
                res = -EINVAL;
                goto out;

diff --cc security/keys/request_key.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge