Skip to content

Commit

Permalink
ext4 crypto: reorganize how we store keys in the inode
Browse files Browse the repository at this point in the history
This is a pretty massive patch which does a number of different things:

1) The per-inode encryption information is now stored in an allocated
   data structure, ext4_crypt_info, instead of directly in the node.
   This reduces the size usage of an in-memory inode when it is not
   using encryption.

2) We drop the ext4_fname_crypto_ctx entirely, and use the per-inode
   encryption structure instead.  This remove an unnecessary memory
   allocation and free for the fname_crypto_ctx as well as allowing us
   to reuse the ctfm in a directory for multiple lookups and file
   creations.

3) We also cache the inode's policy information in the ext4_crypt_info
   structure so we don't have to continually read it out of the
   extended attributes.

4) We now keep the keyring key in the inode's encryption structure
   instead of releasing it after we are done using it to derive the
   per-inode key.  This allows us to test to see if the key has been
   revoked; if it has, we prevent the use of the derived key and free
   it.

5) When an inode is released (or when the derived key is freed), we
   will use memset_explicit() to zero out the derived key, so it's not
   left hanging around in memory.  This implies that when a user logs
   out, it is important to first revoke the key, and then unlink it,
   and then finally, to use "echo 3 > /proc/sys/vm/drop_caches" to
   release any decrypted pages and dcache entries from the system
   caches.

6) All this, and we also shrink the number of lines of code by around
   100.  :-)

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  • Loading branch information
tytso committed May 18, 2015
1 parent e2881b1 commit b7236e2
Show file tree
Hide file tree
Showing 11 changed files with 246 additions and 346 deletions.
9 changes: 5 additions & 4 deletions fs/ext4/crypto.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,9 @@ struct ext4_crypto_ctx *ext4_get_crypto_ctx(struct inode *inode)
struct ext4_crypto_ctx *ctx = NULL;
int res = 0;
unsigned long flags;
struct ext4_crypt_info *ci = &EXT4_I(inode)->i_crypt_info;
struct ext4_crypt_info *ci = EXT4_I(inode)->i_crypt_info;

BUG_ON(ci == NULL);
if (!ext4_read_workqueue)
ext4_init_crypto();

Expand Down Expand Up @@ -322,7 +323,7 @@ static int ext4_page_crypto(struct ext4_crypto_ctx *ctx,
int res = 0;

BUG_ON(!ctx->tfm);
BUG_ON(ctx->mode != ei->i_crypt_info.ci_mode);
BUG_ON(ctx->mode != ei->i_crypt_info->ci_mode);

if (ctx->mode != EXT4_ENCRYPTION_MODE_AES_256_XTS) {
printk_ratelimited(KERN_ERR
Expand All @@ -334,8 +335,8 @@ static int ext4_page_crypto(struct ext4_crypto_ctx *ctx,
crypto_ablkcipher_clear_flags(atfm, ~0);
crypto_tfm_set_flags(ctx->tfm, CRYPTO_TFM_REQ_WEAK_KEY);

res = crypto_ablkcipher_setkey(atfm, ei->i_crypt_info.ci_raw,
ei->i_crypt_info.ci_size);
res = crypto_ablkcipher_setkey(atfm, ei->i_crypt_info->ci_raw,
ei->i_crypt_info->ci_size);
if (res) {
printk_ratelimited(KERN_ERR
"%s: crypto_ablkcipher_setkey() failed\n",
Expand Down
Loading

0 comments on commit b7236e2

Please sign in to comment.