From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 Nov 2015 01:54:46 +0000 (+1100)
Subject: Merge remote-tracking branch 'security/next'
X-Git-Tag: KARO-TXUL-2015-12-04~78
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=0c5184e576e10ebbc8297dd1c7be6969781331e3

Merge remote-tracking branch 'security/next'
---

0c5184e576e10ebbc8297dd1c7be6969781331e3
diff --cc fs/ext4/crypto_key.c
index f9270ec2a132,5c52c79dea46..c5882b36e558
--- a/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;