evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ext4 crypto: get rid of ci_mode from struct ext4_crypt_info

Browse source 
The ci_mode field was superfluous, and getting rid of it gets rid of
an unused hole in the structure.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o 2015-05-18 13:20:47 -04:00
parent 8ee0371470
commit 1aaa6e8b24
4 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fs/ext4/crypto.c
View file

@ -137,14 +137,13 @@ struct ext4_crypto_ctx *ext4_get_crypto_ctx(struct inode *inode)
/* Allocate a new Crypto API context if we don't already have /* Allocate a new Crypto API context if we don't already have
* one or if it isn't the right mode. */ * one or if it isn't the right mode. */
BUG_ON(ci->ci_mode == EXT4_ENCRYPTION_MODE_INVALID); if (ctx->tfm && (ctx->mode != ci->ci_data_mode)) {
if (ctx->tfm && (ctx->mode != ci->ci_mode)) {
crypto_free_tfm(ctx->tfm); crypto_free_tfm(ctx->tfm);
ctx->tfm = NULL; ctx->tfm = NULL;
ctx->mode = EXT4_ENCRYPTION_MODE_INVALID; ctx->mode = EXT4_ENCRYPTION_MODE_INVALID;
} }
if (!ctx->tfm) { if (!ctx->tfm) {
switch (ci->ci_mode) { switch (ci->ci_data_mode) {
case EXT4_ENCRYPTION_MODE_AES_256_XTS: case EXT4_ENCRYPTION_MODE_AES_256_XTS:
ctx->tfm = crypto_ablkcipher_tfm( ctx->tfm = crypto_ablkcipher_tfm(
crypto_alloc_ablkcipher("xts(aes)", 0, 0)); crypto_alloc_ablkcipher("xts(aes)", 0, 0));
@ -162,9 +161,9 @@ struct ext4_crypto_ctx *ext4_get_crypto_ctx(struct inode *inode)
ctx->tfm = NULL; ctx->tfm = NULL;
goto out; goto out;
} }
ctx->mode = ci->ci_mode; ctx->mode = ci->ci_data_mode;
} }
BUG_ON(ci->ci_size != ext4_encryption_key_size(ci->ci_mode)); BUG_ON(ci->ci_size != ext4_encryption_key_size(ci->ci_data_mode));
/* There shouldn't be a bounce page attached to the crypto /* There shouldn't be a bounce page attached to the crypto
* context at this point. */ * context at this point. */
@ -321,7 +320,7 @@ static int ext4_page_crypto(struct ext4_crypto_ctx *ctx,
int res = 0; int res = 0;
BUG_ON(!ctx->tfm); BUG_ON(!ctx->tfm);
BUG_ON(ctx->mode != ei->i_crypt_info->ci_mode); BUG_ON(ctx->mode != ei->i_crypt_info->ci_data_mode);
if (ctx->mode != EXT4_ENCRYPTION_MODE_AES_256_XTS) { if (ctx->mode != EXT4_ENCRYPTION_MODE_AES_256_XTS) {
printk_ratelimited(KERN_ERR printk_ratelimited(KERN_ERR

4
fs/ext4/crypto_fname.c
View file

@ -272,9 +272,9 @@ int ext4_setup_fname_crypto(struct inode *inode)
if (!ci || ci->ci_ctfm) if (!ci || ci->ci_ctfm)
return 0; return 0;
if (ci->ci_mode != EXT4_ENCRYPTION_MODE_AES_256_CTS) { if (ci->ci_filename_mode != EXT4_ENCRYPTION_MODE_AES_256_CTS) {
printk_once(KERN_WARNING "ext4: unsupported key mode %d\n", printk_once(KERN_WARNING "ext4: unsupported key mode %d\n",
ci->ci_mode); ci->ci_filename_mode);
return -ENOKEY; return -ENOKEY;
} }

11
fs/ext4/crypto_key.c
View file

@ -152,14 +152,13 @@ int _ext4_get_encryption_info(struct inode *inode)
memcpy(crypt_info->ci_master_key, ctx.master_key_descriptor, memcpy(crypt_info->ci_master_key, ctx.master_key_descriptor,
sizeof(crypt_info->ci_master_key)); sizeof(crypt_info->ci_master_key));
if (S_ISREG(inode->i_mode)) if (S_ISREG(inode->i_mode))
crypt_info->ci_mode = ctx.contents_encryption_mode; crypt_info->ci_size =
ext4_encryption_key_size(crypt_info->ci_data_mode);
else if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode)) else if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode))
crypt_info->ci_mode = ctx.filenames_encryption_mode; crypt_info->ci_size =
else { ext4_encryption_key_size(crypt_info->ci_filename_mode);
printk(KERN_ERR "ext4 crypto: Unsupported inode type.\n"); else
BUG(); BUG();
}
crypt_info->ci_size = ext4_encryption_key_size(crypt_info->ci_mode);
BUG_ON(!crypt_info->ci_size); BUG_ON(!crypt_info->ci_size);
if (DUMMY_ENCRYPTION_ENABLED(sbi)) { if (DUMMY_ENCRYPTION_ENABLED(sbi)) {
memset(crypt_info->ci_raw, 0x42, EXT4_AES_256_XTS_KEY_SIZE); memset(crypt_info->ci_raw, 0x42, EXT4_AES_256_XTS_KEY_SIZE);

1
fs/ext4/ext4_crypto.h
View file

@ -74,7 +74,6 @@ struct ext4_encryption_key {
} __attribute__((__packed__)); } __attribute__((__packed__));
struct ext4_crypt_info { struct ext4_crypt_info {
unsigned char ci_mode;
unsigned char ci_size; unsigned char ci_size;
char ci_data_mode; char ci_data_mode;
char ci_filename_mode; char ci_filename_mode;