lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 1 Nov 2015 22:12:06 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: James Morris <jmorris@...ei.org>, Theodore Ts'o <tytso@....edu> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, David Howells <dhowells@...hat.com> Subject: linux-next: manual merge of the security tree with the ext4 tree 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@...b.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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists