Commit 27c25703 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'v6.16-p7' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fixes from Herbert Xu:
 "This fixes buffer overflows in qat and chelsio"

* tag 'v6.16-p7' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: qat - Use crypto_shash_export_core
  crypto: chelsio - Use crypto_shash_export_core
parents 414aaef1 ccafe282

drivers/crypto/chelsio/chcr_algo.c

+5 −5
Original line number Diff line number Diff line
@@ -314,30 +314,30 @@ static int chcr_compute_partial_hash(struct shash_desc *desc, 
	if (digest_size == SHA1_DIGEST_SIZE) {

		error = crypto_shash_init(desc) ?:

			crypto_shash_update(desc, iopad, SHA1_BLOCK_SIZE) ?:

			crypto_shash_export(desc, (void *)&sha1_st);

			crypto_shash_export_core(desc, &sha1_st);

		memcpy(result_hash, sha1_st.state, SHA1_DIGEST_SIZE);

	} else if (digest_size == SHA224_DIGEST_SIZE) {

		error = crypto_shash_init(desc) ?:

			crypto_shash_update(desc, iopad, SHA256_BLOCK_SIZE) ?:

			crypto_shash_export(desc, (void *)&sha256_st);

			crypto_shash_export_core(desc, &sha256_st);

		memcpy(result_hash, sha256_st.state, SHA256_DIGEST_SIZE);



	} else if (digest_size == SHA256_DIGEST_SIZE) {

		error = crypto_shash_init(desc) ?:

			crypto_shash_update(desc, iopad, SHA256_BLOCK_SIZE) ?:

			crypto_shash_export(desc, (void *)&sha256_st);

			crypto_shash_export_core(desc, &sha256_st);

		memcpy(result_hash, sha256_st.state, SHA256_DIGEST_SIZE);



	} else if (digest_size == SHA384_DIGEST_SIZE) {

		error = crypto_shash_init(desc) ?:

			crypto_shash_update(desc, iopad, SHA512_BLOCK_SIZE) ?:

			crypto_shash_export(desc, (void *)&sha512_st);

			crypto_shash_export_core(desc, &sha512_st);

		memcpy(result_hash, sha512_st.state, SHA512_DIGEST_SIZE);



	} else if (digest_size == SHA512_DIGEST_SIZE) {

		error = crypto_shash_init(desc) ?:

			crypto_shash_update(desc, iopad, SHA512_BLOCK_SIZE) ?:

			crypto_shash_export(desc, (void *)&sha512_st);

			crypto_shash_export_core(desc, &sha512_st);

		memcpy(result_hash, sha512_st.state, SHA512_DIGEST_SIZE);

	} else {

		error = -EINVAL;

drivers/crypto/intel/qat/qat_common/qat_algs.c

+7 −7
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ 
#include <linux/crypto.h>

#include <crypto/internal/aead.h>

#include <crypto/internal/cipher.h>

#include <crypto/internal/hash.h>

#include <crypto/internal/skcipher.h>

#include <crypto/aes.h>

#include <crypto/sha1.h>

#include <crypto/sha2.h>

#include <crypto/hash.h>

#include <crypto/hmac.h>

#include <crypto/algapi.h>

#include <crypto/authenc.h>
@@ -154,19 +154,19 @@ static int qat_alg_do_precomputes(struct icp_qat_hw_auth_algo_blk *hash, 


	switch (ctx->qat_hash_alg) {

	case ICP_QAT_HW_AUTH_ALGO_SHA1:

		if (crypto_shash_export(shash, &ctx->sha1))

		if (crypto_shash_export_core(shash, &ctx->sha1))

			return -EFAULT;

		for (i = 0; i < digest_size >> 2; i++, hash_state_out++)

			*hash_state_out = cpu_to_be32(ctx->sha1.state[i]);

		break;

	case ICP_QAT_HW_AUTH_ALGO_SHA256:

		if (crypto_shash_export(shash, &ctx->sha256))

		if (crypto_shash_export_core(shash, &ctx->sha256))

			return -EFAULT;

		for (i = 0; i < digest_size >> 2; i++, hash_state_out++)

			*hash_state_out = cpu_to_be32(ctx->sha256.state[i]);

		break;

	case ICP_QAT_HW_AUTH_ALGO_SHA512:

		if (crypto_shash_export(shash, &ctx->sha512))

		if (crypto_shash_export_core(shash, &ctx->sha512))

			return -EFAULT;

		for (i = 0; i < digest_size >> 3; i++, hash512_state_out++)

			*hash512_state_out = cpu_to_be64(ctx->sha512.state[i]);
@@ -190,19 +190,19 @@ static int qat_alg_do_precomputes(struct icp_qat_hw_auth_algo_blk *hash, 


	switch (ctx->qat_hash_alg) {

	case ICP_QAT_HW_AUTH_ALGO_SHA1:

		if (crypto_shash_export(shash, &ctx->sha1))

		if (crypto_shash_export_core(shash, &ctx->sha1))

			return -EFAULT;

		for (i = 0; i < digest_size >> 2; i++, hash_state_out++)

			*hash_state_out = cpu_to_be32(ctx->sha1.state[i]);

		break;

	case ICP_QAT_HW_AUTH_ALGO_SHA256:

		if (crypto_shash_export(shash, &ctx->sha256))

		if (crypto_shash_export_core(shash, &ctx->sha256))

			return -EFAULT;

		for (i = 0; i < digest_size >> 2; i++, hash_state_out++)

			*hash_state_out = cpu_to_be32(ctx->sha256.state[i]);

		break;

	case ICP_QAT_HW_AUTH_ALGO_SHA512:

		if (crypto_shash_export(shash, &ctx->sha512))

		if (crypto_shash_export_core(shash, &ctx->sha512))

			return -EFAULT;

		for (i = 0; i < digest_size >> 3; i++, hash512_state_out++)

			*hash512_state_out = cpu_to_be64(ctx->sha512.state[i]);