* linux-next: manual merge of the security tree with the ext4 tree
@ 2015-11-01 11:12 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-11-01 11:12 UTC (permalink / raw)
To: James Morris, Theodore Ts'o; +Cc: linux-next, linux-kernel, David Howells
Hi James,
Today's linux-next merge of the security tree got a conflict in:
fs/ext4/crypto_key.c
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).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
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->payload.data);
+ ukp = user_key_payload(keyring_key);
if (ukp->datalen != sizeof(struct ext4_encryption_key)) {
res = -EINVAL;
goto out;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-11-01 11:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-01 11:12 linux-next: manual merge of the security tree with the ext4 tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox