linux-next: manual merge of the security tree with the ext4 tree

From: Stephen Rothwell
Date: Sun Nov 01 2015 - 06:12:15 EST

Hi James,

Today's linux-next merge of the security tree got a conflict in:


between commit:

687c3c36e754 ("ext4 crypto: replace some BUG_ON()'s with error checks")

from the ext4 tree and commit:

146aa8b1453b ("KEYS: Merge the type-specific data with the payload data")

from the security tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc fs/ext4/crypto_key.c
index f9270ec2a132,5c52c79dea46..000000000000
--- 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->;
+ ukp = user_key_payload(keyring_key);
if (ukp->datalen != sizeof(struct ext4_encryption_key)) {
res = -EINVAL;
goto out;
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at