Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 551a09a7 authored by Herbert Xu's avatar Herbert Xu
Browse files

[CRYPTO] api: Sanitise mask when allocating ablkcipher/hash 



When allocating ablkcipher/hash objects, we use a mask that's wider than
the usual type mask.  This patch sanitises the mask supplied by the user
so we don't end up using a narrower mask which may lead to unintended
results.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 5e553110

include/linux/crypto.h

+4 −0
Original line number Diff line number Diff line
@@ -532,6 +532,7 @@ static inline struct crypto_ablkcipher *crypto_alloc_ablkcipher( 
	const char *alg_name, u32 type, u32 mask)

{

	type &= ~CRYPTO_ALG_TYPE_MASK;

	mask &= ~CRYPTO_ALG_TYPE_MASK;

	type |= CRYPTO_ALG_TYPE_BLKCIPHER;

	mask |= CRYPTO_ALG_TYPE_BLKCIPHER_MASK;
@@ -554,6 +555,7 @@ static inline int crypto_has_ablkcipher(const char *alg_name, u32 type, 
					u32 mask)

{

	type &= ~CRYPTO_ALG_TYPE_MASK;

	mask &= ~CRYPTO_ALG_TYPE_MASK;

	type |= CRYPTO_ALG_TYPE_BLKCIPHER;

	mask |= CRYPTO_ALG_TYPE_BLKCIPHER_MASK;
@@ -1086,6 +1088,7 @@ static inline struct crypto_hash *crypto_alloc_hash(const char *alg_name, 
						    u32 type, u32 mask)

{

	type &= ~CRYPTO_ALG_TYPE_MASK;

	mask &= ~CRYPTO_ALG_TYPE_MASK;

	type |= CRYPTO_ALG_TYPE_HASH;

	mask |= CRYPTO_ALG_TYPE_HASH_MASK;
@@ -1105,6 +1108,7 @@ static inline void crypto_free_hash(struct crypto_hash *tfm) 
static inline int crypto_has_hash(const char *alg_name, u32 type, u32 mask)

{

	type &= ~CRYPTO_ALG_TYPE_MASK;

	mask &= ~CRYPTO_ALG_TYPE_MASK;

	type |= CRYPTO_ALG_TYPE_HASH;

	mask |= CRYPTO_ALG_TYPE_HASH_MASK;