Commit 6f69c981 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull crypto fixes from Herbert Xu:

 - A long-standing bug in crypto_engine

 - A buggy but harmless check in the sun8i-ss driver

 - A regression in the CRYPTO_USER interface

* tag 'v6.4-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: api - Fix CRYPTO_USER checks for report function
  crypto: engine - fix crypto_queue backlog handling
  crypto: sun8i-ss - Fix a test in sun8i_ss_setup_ivs()
parents 63342b1d b8969a1b

crypto/acompress.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static const struct crypto_type crypto_acomp_type = { 
#ifdef CONFIG_PROC_FS

	.show = crypto_acomp_show,

#endif

#ifdef CONFIG_CRYPTO_USER

#if IS_ENABLED(CONFIG_CRYPTO_USER)

	.report = crypto_acomp_report,

#endif

#ifdef CONFIG_CRYPTO_STATS

crypto/aead.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static const struct crypto_type crypto_aead_type = { 
#ifdef CONFIG_PROC_FS

	.show = crypto_aead_show,

#endif

#ifdef CONFIG_CRYPTO_USER

#if IS_ENABLED(CONFIG_CRYPTO_USER)

	.report = crypto_aead_report,

#endif

#ifdef CONFIG_CRYPTO_STATS

crypto/ahash.c

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ static const struct crypto_type crypto_ahash_type = { 
#ifdef CONFIG_PROC_FS

	.show = crypto_ahash_show,

#endif

#ifdef CONFIG_CRYPTO_USER

#if IS_ENABLED(CONFIG_CRYPTO_USER)

	.report = crypto_ahash_report,

#endif

#ifdef CONFIG_CRYPTO_STATS

crypto/akcipher.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static const struct crypto_type crypto_akcipher_type = { 
#ifdef CONFIG_PROC_FS

	.show = crypto_akcipher_show,

#endif

#ifdef CONFIG_CRYPTO_USER

#if IS_ENABLED(CONFIG_CRYPTO_USER)

	.report = crypto_akcipher_report,

#endif

#ifdef CONFIG_CRYPTO_STATS

crypto/algapi.c

+3 −0
Original line number Diff line number Diff line
@@ -961,6 +961,9 @@ EXPORT_SYMBOL_GPL(crypto_enqueue_request); 
void crypto_enqueue_request_head(struct crypto_queue *queue,

				 struct crypto_async_request *request)

{

	if (unlikely(queue->qlen >= queue->max_qlen))

		queue->backlog = queue->backlog->prev;



	queue->qlen++;

	list_add(&request->list, &queue->list);

}