Commit 88f76bc3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fixes from Herbert Xu:
 "This fixes a number of issues in the chelsio and caam drivers"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  Revert "crypto: caam/jr - Remove extra memory barrier during job ring dequeue"
  crypto: caam - fix caam_dump_sg that iterates through scatterlist
  crypto: caam - fix DKP detection logic
  MAINTAINERS: Maintainer for Chelsio crypto driver
  crypto: chelsio - count incomplete block in IV
  crypto: chelsio - Fix softlockup with heavy I/O
  crypto: chelsio - Fix NULL pointer dereference
parents 89963adc cbc22b06

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4316,7 +4316,7 @@ F: drivers/infiniband/hw/cxgb3/ 
F:	include/uapi/rdma/cxgb3-abi.h



CXGB4 CRYPTO DRIVER (chcr)

M:	Harsh Jain <harsh@chelsio.com>

M:	Atul Gupta <atul.gupta@chelsio.com>

L:	linux-crypto@vger.kernel.org

W:	http://www.chelsio.com

S:	Supported

drivers/crypto/caam/caamalg.c

+7 −2
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ struct caam_alg_entry { 
	int class2_alg_type;

	bool rfc3686;

	bool geniv;

	bool nodkp;

};



struct caam_aead_alg {
@@ -2052,6 +2053,7 @@ static struct caam_aead_alg driver_aeads[] = { 
		},

		.caam = {

			.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_GCM,

			.nodkp = true,

		},

	},

	{
@@ -2070,6 +2072,7 @@ static struct caam_aead_alg driver_aeads[] = { 
		},

		.caam = {

			.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_GCM,

			.nodkp = true,

		},

	},

	/* Galois Counter Mode */
@@ -2089,6 +2092,7 @@ static struct caam_aead_alg driver_aeads[] = { 
		},

		.caam = {

			.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_GCM,

			.nodkp = true,

		},

	},

	/* single-pass ipsec_esp descriptor */
@@ -3334,6 +3338,7 @@ static struct caam_aead_alg driver_aeads[] = { 
					   OP_ALG_AAI_AEAD,

			.class2_alg_type = OP_ALG_ALGSEL_POLY1305 |

					   OP_ALG_AAI_AEAD,

			.nodkp = true,

		},

	},

	{
@@ -3356,6 +3361,7 @@ static struct caam_aead_alg driver_aeads[] = { 
					   OP_ALG_AAI_AEAD,

			.class2_alg_type = OP_ALG_ALGSEL_POLY1305 |

					   OP_ALG_AAI_AEAD,

			.nodkp = true,

		},

	},

};
@@ -3417,8 +3423,7 @@ static int caam_aead_init(struct crypto_aead *tfm) 
		 container_of(alg, struct caam_aead_alg, aead);

	struct caam_ctx *ctx = crypto_aead_ctx(tfm);



	return caam_init_common(ctx, &caam_alg->caam,

				alg->setkey == aead_setkey);

	return caam_init_common(ctx, &caam_alg->caam, !caam_alg->caam.nodkp);

}



static void caam_exit_common(struct caam_ctx *ctx)

drivers/crypto/caam/caamalg_qi.c

+5 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ struct caam_alg_entry { 
	int class2_alg_type;

	bool rfc3686;

	bool geniv;

	bool nodkp;

};



struct caam_aead_alg {
@@ -1523,6 +1524,7 @@ static struct caam_aead_alg driver_aeads[] = { 
		},

		.caam = {

			.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_GCM,

			.nodkp = true,

		},

	},

	{
@@ -1541,6 +1543,7 @@ static struct caam_aead_alg driver_aeads[] = { 
		},

		.caam = {

			.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_GCM,

			.nodkp = true,

		},

	},

	/* Galois Counter Mode */
@@ -1560,6 +1563,7 @@ static struct caam_aead_alg driver_aeads[] = { 
		},

		.caam = {

			.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_GCM,

			.nodkp = true,

		}

	},

	/* single-pass ipsec_esp descriptor */
@@ -2433,8 +2437,7 @@ static int caam_aead_init(struct crypto_aead *tfm) 
						      aead);

	struct caam_ctx *ctx = crypto_aead_ctx(tfm);



	return caam_init_common(ctx, &caam_alg->caam,

				alg->setkey == aead_setkey);

	return caam_init_common(ctx, &caam_alg->caam, !caam_alg->caam.nodkp);

}



static void caam_exit_common(struct caam_ctx *ctx)

drivers/crypto/caam/caamalg_qi2.c

+7 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ struct caam_alg_entry { 
	int class2_alg_type;

	bool rfc3686;

	bool geniv;

	bool nodkp;

};



struct caam_aead_alg {
@@ -1480,7 +1481,7 @@ static int caam_cra_init_aead(struct crypto_aead *tfm) 


	crypto_aead_set_reqsize(tfm, sizeof(struct caam_request));

	return caam_cra_init(crypto_aead_ctx(tfm), &caam_alg->caam,

			     alg->setkey == aead_setkey);

			     !caam_alg->caam.nodkp);

}



static void caam_exit_common(struct caam_ctx *ctx)
@@ -1641,6 +1642,7 @@ static struct caam_aead_alg driver_aeads[] = { 
		},

		.caam = {

			.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_GCM,

			.nodkp = true,

		},

	},

	{
@@ -1659,6 +1661,7 @@ static struct caam_aead_alg driver_aeads[] = { 
		},

		.caam = {

			.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_GCM,

			.nodkp = true,

		},

	},

	/* Galois Counter Mode */
@@ -1678,6 +1681,7 @@ static struct caam_aead_alg driver_aeads[] = { 
		},

		.caam = {

			.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_GCM,

			.nodkp = true,

		}

	},

	/* single-pass ipsec_esp descriptor */
@@ -2755,6 +2759,7 @@ static struct caam_aead_alg driver_aeads[] = { 
					   OP_ALG_AAI_AEAD,

			.class2_alg_type = OP_ALG_ALGSEL_POLY1305 |

					   OP_ALG_AAI_AEAD,

			.nodkp = true,

		},

	},

	{
@@ -2777,6 +2782,7 @@ static struct caam_aead_alg driver_aeads[] = { 
					   OP_ALG_AAI_AEAD,

			.class2_alg_type = OP_ALG_ALGSEL_POLY1305 |

					   OP_ALG_AAI_AEAD,

			.nodkp = true,

		},

	},

	{

drivers/crypto/caam/error.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ void caam_dump_sg(const char *level, const char *prefix_str, int prefix_type, 
	size_t len;

	void *buf;



	for (it = sg; it && tlen > 0 ; it = sg_next(sg)) {

	for (it = sg; it && tlen > 0 ; it = sg_next(it)) {

		/*

		 * make sure the scatterlist's page

		 * has a valid virtual memory mapping

CRA Git | Maintained and supported by SUSTech CRA and CCSE