Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 01:54:46 +0000 (12:54 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 01:54:46 +0000 (12:54 +1100)
1  2 
MAINTAINERS
crypto/asymmetric_keys/x509_public_key.c
fs/cifs/connect.c
fs/cifs/smb2pdu.c
fs/ext4/crypto_key.c
security/keys/request_key.c
security/selinux/hooks.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
@@@ -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;
Simple merge
Simple merge