Commit 6320a15e authored by Sami Tolvanen's avatar Sami Tolvanen Committed by Herbert Xu
Browse files

crypto: arm64/sha - fix function types 



Instead of casting pointers to callback functions, add C wrappers
to avoid type mismatch failures with Control-Flow Integrity (CFI)
checking.

Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
Reviewed-by: default avatarArd Biesheuvel <ardb@kernel.org>
Reviewed-by: default avatarEric Biggers <ebiggers@kernel.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 11548f5a

arch/arm64/crypto/sha1-ce-glue.c

+11 −6
Original line number Diff line number Diff line
@@ -28,6 +28,13 @@ struct sha1_ce_state { 
asmlinkage void sha1_ce_transform(struct sha1_ce_state *sst, u8 const *src,

				  int blocks);



static void __sha1_ce_transform(struct sha1_state *sst, u8 const *src,

				int blocks)

{

	sha1_ce_transform(container_of(sst, struct sha1_ce_state, sst), src,

			  blocks);

}



const u32 sha1_ce_offsetof_count = offsetof(struct sha1_ce_state, sst.count);

const u32 sha1_ce_offsetof_finalize = offsetof(struct sha1_ce_state, finalize);
@@ -41,8 +48,7 @@ static int sha1_ce_update(struct shash_desc *desc, const u8 *data, 


	sctx->finalize = 0;

	kernel_neon_begin();

	sha1_base_do_update(desc, data, len,

			    (sha1_block_fn *)sha1_ce_transform);

	sha1_base_do_update(desc, data, len, __sha1_ce_transform);

	kernel_neon_end();



	return 0;
@@ -64,10 +70,9 @@ static int sha1_ce_finup(struct shash_desc *desc, const u8 *data, 
	sctx->finalize = finalize;



	kernel_neon_begin();

	sha1_base_do_update(desc, data, len,

			    (sha1_block_fn *)sha1_ce_transform);

	sha1_base_do_update(desc, data, len, __sha1_ce_transform);

	if (!finalize)

		sha1_base_do_finalize(desc, (sha1_block_fn *)sha1_ce_transform);

		sha1_base_do_finalize(desc, __sha1_ce_transform);

	kernel_neon_end();

	return sha1_base_finish(desc, out);

}
@@ -81,7 +86,7 @@ static int sha1_ce_final(struct shash_desc *desc, u8 *out) 


	sctx->finalize = 0;

	kernel_neon_begin();

	sha1_base_do_finalize(desc, (sha1_block_fn *)sha1_ce_transform);

	sha1_base_do_finalize(desc, __sha1_ce_transform);

	kernel_neon_end();

	return sha1_base_finish(desc, out);

}

arch/arm64/crypto/sha2-ce-glue.c

+21 −13
Original line number Diff line number Diff line
@@ -28,6 +28,13 @@ struct sha256_ce_state { 
asmlinkage void sha2_ce_transform(struct sha256_ce_state *sst, u8 const *src,

				  int blocks);



static void __sha2_ce_transform(struct sha256_state *sst, u8 const *src,

				int blocks)

{

	sha2_ce_transform(container_of(sst, struct sha256_ce_state, sst), src,

			  blocks);

}



const u32 sha256_ce_offsetof_count = offsetof(struct sha256_ce_state,

					      sst.count);

const u32 sha256_ce_offsetof_finalize = offsetof(struct sha256_ce_state,
@@ -35,6 +42,12 @@ const u32 sha256_ce_offsetof_finalize = offsetof(struct sha256_ce_state, 


asmlinkage void sha256_block_data_order(u32 *digest, u8 const *src, int blocks);



static void __sha256_block_data_order(struct sha256_state *sst, u8 const *src,

				      int blocks)

{

	sha256_block_data_order(sst->state, src, blocks);

}



static int sha256_ce_update(struct shash_desc *desc, const u8 *data,

			    unsigned int len)

{
@@ -42,12 +55,11 @@ static int sha256_ce_update(struct shash_desc *desc, const u8 *data, 


	if (!crypto_simd_usable())

		return sha256_base_do_update(desc, data, len,

				(sha256_block_fn *)sha256_block_data_order);

				__sha256_block_data_order);



	sctx->finalize = 0;

	kernel_neon_begin();

	sha256_base_do_update(desc, data, len,

			      (sha256_block_fn *)sha2_ce_transform);

	sha256_base_do_update(desc, data, len, __sha2_ce_transform);

	kernel_neon_end();



	return 0;
@@ -62,9 +74,8 @@ static int sha256_ce_finup(struct shash_desc *desc, const u8 *data, 
	if (!crypto_simd_usable()) {

		if (len)

			sha256_base_do_update(desc, data, len,

				(sha256_block_fn *)sha256_block_data_order);

		sha256_base_do_finalize(desc,

				(sha256_block_fn *)sha256_block_data_order);

				__sha256_block_data_order);

		sha256_base_do_finalize(desc, __sha256_block_data_order);

		return sha256_base_finish(desc, out);

	}
@@ -75,11 +86,9 @@ static int sha256_ce_finup(struct shash_desc *desc, const u8 *data, 
	sctx->finalize = finalize;



	kernel_neon_begin();

	sha256_base_do_update(desc, data, len,

			      (sha256_block_fn *)sha2_ce_transform);

	sha256_base_do_update(desc, data, len, __sha2_ce_transform);

	if (!finalize)

		sha256_base_do_finalize(desc,

					(sha256_block_fn *)sha2_ce_transform);

		sha256_base_do_finalize(desc, __sha2_ce_transform);

	kernel_neon_end();

	return sha256_base_finish(desc, out);

}
@@ -89,14 +98,13 @@ static int sha256_ce_final(struct shash_desc *desc, u8 *out) 
	struct sha256_ce_state *sctx = shash_desc_ctx(desc);



	if (!crypto_simd_usable()) {

		sha256_base_do_finalize(desc,

				(sha256_block_fn *)sha256_block_data_order);

		sha256_base_do_finalize(desc, __sha256_block_data_order);

		return sha256_base_finish(desc, out);

	}



	sctx->finalize = 0;

	kernel_neon_begin();

	sha256_base_do_finalize(desc, (sha256_block_fn *)sha2_ce_transform);

	sha256_base_do_finalize(desc, __sha2_ce_transform);

	kernel_neon_end();

	return sha256_base_finish(desc, out);

}

arch/arm64/crypto/sha256-glue.c

+20 −12
Original line number Diff line number Diff line
@@ -27,14 +27,26 @@ asmlinkage void sha256_block_data_order(u32 *digest, const void *data, 
					unsigned int num_blks);

EXPORT_SYMBOL(sha256_block_data_order);



static void __sha256_block_data_order(struct sha256_state *sst, u8 const *src,

				      int blocks)

{

	sha256_block_data_order(sst->state, src, blocks);

}



asmlinkage void sha256_block_neon(u32 *digest, const void *data,

				  unsigned int num_blks);



static void __sha256_block_neon(struct sha256_state *sst, u8 const *src,

				int blocks)

{

	sha256_block_neon(sst->state, src, blocks);

}



static int crypto_sha256_arm64_update(struct shash_desc *desc, const u8 *data,

				      unsigned int len)

{

	return sha256_base_do_update(desc, data, len,

				(sha256_block_fn *)sha256_block_data_order);

				     __sha256_block_data_order);

}



static int crypto_sha256_arm64_finup(struct shash_desc *desc, const u8 *data,
@@ -42,9 +54,8 @@ static int crypto_sha256_arm64_finup(struct shash_desc *desc, const u8 *data, 
{

	if (len)

		sha256_base_do_update(desc, data, len,

				(sha256_block_fn *)sha256_block_data_order);

	sha256_base_do_finalize(desc,

				(sha256_block_fn *)sha256_block_data_order);

				      __sha256_block_data_order);

	sha256_base_do_finalize(desc, __sha256_block_data_order);



	return sha256_base_finish(desc, out);

}
@@ -87,7 +98,7 @@ static int sha256_update_neon(struct shash_desc *desc, const u8 *data, 


	if (!crypto_simd_usable())

		return sha256_base_do_update(desc, data, len,

				(sha256_block_fn *)sha256_block_data_order);

				__sha256_block_data_order);



	while (len > 0) {

		unsigned int chunk = len;
@@ -103,8 +114,7 @@ static int sha256_update_neon(struct shash_desc *desc, const u8 *data, 
				sctx->count % SHA256_BLOCK_SIZE;



		kernel_neon_begin();

		sha256_base_do_update(desc, data, chunk,

				      (sha256_block_fn *)sha256_block_neon);

		sha256_base_do_update(desc, data, chunk, __sha256_block_neon);

		kernel_neon_end();

		data += chunk;

		len -= chunk;
@@ -118,15 +128,13 @@ static int sha256_finup_neon(struct shash_desc *desc, const u8 *data, 
	if (!crypto_simd_usable()) {

		if (len)

			sha256_base_do_update(desc, data, len,

				(sha256_block_fn *)sha256_block_data_order);

		sha256_base_do_finalize(desc,

				(sha256_block_fn *)sha256_block_data_order);

				__sha256_block_data_order);

		sha256_base_do_finalize(desc, __sha256_block_data_order);

	} else {

		if (len)

			sha256_update_neon(desc, data, len);

		kernel_neon_begin();

		sha256_base_do_finalize(desc,

				(sha256_block_fn *)sha256_block_neon);

		sha256_base_do_finalize(desc, __sha256_block_neon);

		kernel_neon_end();

	}

	return sha256_base_finish(desc, out);

arch/arm64/crypto/sha512-ce-glue.c

+14 −12
Original line number Diff line number Diff line
@@ -29,16 +29,21 @@ asmlinkage void sha512_ce_transform(struct sha512_state *sst, u8 const *src, 


asmlinkage void sha512_block_data_order(u64 *digest, u8 const *src, int blocks);



static void __sha512_block_data_order(struct sha512_state *sst, u8 const *src,

				      int blocks)

{

	sha512_block_data_order(sst->state, src, blocks);

}



static int sha512_ce_update(struct shash_desc *desc, const u8 *data,

			    unsigned int len)

{

	if (!crypto_simd_usable())

		return sha512_base_do_update(desc, data, len,

				(sha512_block_fn *)sha512_block_data_order);

					     __sha512_block_data_order);



	kernel_neon_begin();

	sha512_base_do_update(desc, data, len,

			      (sha512_block_fn *)sha512_ce_transform);

	sha512_base_do_update(desc, data, len, sha512_ce_transform);

	kernel_neon_end();



	return 0;
@@ -50,16 +55,14 @@ static int sha512_ce_finup(struct shash_desc *desc, const u8 *data, 
	if (!crypto_simd_usable()) {

		if (len)

			sha512_base_do_update(desc, data, len,

				(sha512_block_fn *)sha512_block_data_order);

		sha512_base_do_finalize(desc,

				(sha512_block_fn *)sha512_block_data_order);

					      __sha512_block_data_order);

		sha512_base_do_finalize(desc, __sha512_block_data_order);

		return sha512_base_finish(desc, out);

	}



	kernel_neon_begin();

	sha512_base_do_update(desc, data, len,

			      (sha512_block_fn *)sha512_ce_transform);

	sha512_base_do_finalize(desc, (sha512_block_fn *)sha512_ce_transform);

	sha512_base_do_update(desc, data, len, sha512_ce_transform);

	sha512_base_do_finalize(desc, sha512_ce_transform);

	kernel_neon_end();

	return sha512_base_finish(desc, out);

}
@@ -67,13 +70,12 @@ static int sha512_ce_finup(struct shash_desc *desc, const u8 *data, 
static int sha512_ce_final(struct shash_desc *desc, u8 *out)

{

	if (!crypto_simd_usable()) {

		sha512_base_do_finalize(desc,

				(sha512_block_fn *)sha512_block_data_order);

		sha512_base_do_finalize(desc, __sha512_block_data_order);

		return sha512_base_finish(desc, out);

	}



	kernel_neon_begin();

	sha512_base_do_finalize(desc, (sha512_block_fn *)sha512_ce_transform);

	sha512_base_do_finalize(desc, sha512_ce_transform);

	kernel_neon_end();

	return sha512_base_finish(desc, out);

}

arch/arm64/crypto/sha512-glue.c

+10 −5
Original line number Diff line number Diff line
@@ -20,15 +20,21 @@ MODULE_LICENSE("GPL v2"); 
MODULE_ALIAS_CRYPTO("sha384");

MODULE_ALIAS_CRYPTO("sha512");



asmlinkage void sha512_block_data_order(u32 *digest, const void *data,

asmlinkage void sha512_block_data_order(u64 *digest, const void *data,

					unsigned int num_blks);

EXPORT_SYMBOL(sha512_block_data_order);



static void __sha512_block_data_order(struct sha512_state *sst, u8 const *src,

				      int blocks)

{

	sha512_block_data_order(sst->state, src, blocks);

}



static int sha512_update(struct shash_desc *desc, const u8 *data,

			 unsigned int len)

{

	return sha512_base_do_update(desc, data, len,

			(sha512_block_fn *)sha512_block_data_order);

				     __sha512_block_data_order);

}



static int sha512_finup(struct shash_desc *desc, const u8 *data,
@@ -36,9 +42,8 @@ static int sha512_finup(struct shash_desc *desc, const u8 *data, 
{

	if (len)

		sha512_base_do_update(desc, data, len,

			(sha512_block_fn *)sha512_block_data_order);

	sha512_base_do_finalize(desc,

			(sha512_block_fn *)sha512_block_data_order);

				      __sha512_block_data_order);

	sha512_base_do_finalize(desc, __sha512_block_data_order);



	return sha512_base_finish(desc, out);

}