a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CRYPTO] dm-crypt: Make iv_gen_private a union

Browse Source 
Rather than stuffing integers into pointers with casts, let's use
a union.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Herbert Xu 2006-12-05 13:41:52 -08:00 committed by David S. Miller
parent 9ebed9d182
commit 79066ad32b
1 changed files with 14 additions and 9 deletions

23
drivers/md/dm-crypt.c
View File

@ -86,7 +86,10 @@ struct crypt_config {
*/ */
struct crypt_iv_operations *iv_gen_ops; struct crypt_iv_operations *iv_gen_ops;
char *iv_mode; char *iv_mode;
struct crypto_cipher *iv_gen_private; union {
struct crypto_cipher *essiv_tfm;
int benbi_shift;
} iv_gen_private;
sector_t iv_offset; sector_t iv_offset;
unsigned int iv_size; unsigned int iv_size;
@ -195,21 +198,21 @@ static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,
} }
kfree(salt); kfree(salt);
cc->iv_gen_private = essiv_tfm; cc->iv_gen_private.essiv_tfm = essiv_tfm;
return 0; return 0;
} }
static void crypt_iv_essiv_dtr(struct crypt_config *cc) static void crypt_iv_essiv_dtr(struct crypt_config *cc)
{ {
crypto_free_cipher(cc->iv_gen_private); crypto_free_cipher(cc->iv_gen_private.essiv_tfm);
cc->iv_gen_private = NULL; cc->iv_gen_private.essiv_tfm = NULL;
} }
static int crypt_iv_essiv_gen(struct crypt_config *cc, u8 *iv, sector_t sector) static int crypt_iv_essiv_gen(struct crypt_config *cc, u8 *iv, sector_t sector)
{ {
memset(iv, 0, cc->iv_size); memset(iv, 0, cc->iv_size);
*(u64 *)iv = cpu_to_le64(sector); *(u64 *)iv = cpu_to_le64(sector);
crypto_cipher_encrypt_one(cc->iv_gen_private, iv, iv); crypto_cipher_encrypt_one(cc->iv_gen_private.essiv_tfm, iv, iv);
return 0; return 0;
} }
@ -232,21 +235,23 @@ static int crypt_iv_benbi_ctr(struct crypt_config *cc, struct dm_target *ti,
return -EINVAL; return -EINVAL;
} }
cc->iv_gen_private = (void *)(9 - log); cc->iv_gen_private.benbi_shift = 9 - log;
return 0; return 0;
} }
static void crypt_iv_benbi_dtr(struct crypt_config *cc) static void crypt_iv_benbi_dtr(struct crypt_config *cc)
{ {
cc->iv_gen_private = NULL;
} }
static int crypt_iv_benbi_gen(struct crypt_config *cc, u8 *iv, sector_t sector) static int crypt_iv_benbi_gen(struct crypt_config *cc, u8 *iv, sector_t sector)
{ {
__be64 val;
memset(iv, 0, cc->iv_size - sizeof(u64)); /* rest is cleared below */ memset(iv, 0, cc->iv_size - sizeof(u64)); /* rest is cleared below */
put_unaligned(cpu_to_be64(((u64)sector << (u32)cc->iv_gen_private) + 1),
(__be64 *)(iv + cc->iv_size - sizeof(u64))); val = cpu_to_be64(((u64)sector << cc->iv_gen_private.benbi_shift) + 1);
put_unaligned(val, (__be64 *)(iv + cc->iv_size - sizeof(u64)));
return 0; return 0;
} }