Commit 33a8b3e9 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:

 - vmalloc stack regression in CCM

 - Build problem in CRC32 on ARM

 - Memory leak in cavium

 - Missing Kconfig dependencies in atmel and mediatek

 - XTS Regression on some platforms (s390 and ppc)

 - Memory overrun in CCM test vector

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: vmx - Use skcipher for xts fallback
  crypto: vmx - Use skcipher for cbc fallback
  crypto: testmgr - Pad aes_ccm_enc_tv_template vector
  crypto: arm/crc32 - add build time test for CRC instruction support
  crypto: arm/crc32 - fix build error with outdated binutils
  crypto: ccm - move cbcmac input off the stack
  crypto: xts - Propagate NEED_FALLBACK bit
  crypto: api - Add crypto_requires_off helper
  crypto: atmel - CRYPTO_DEV_MEDIATEK should depend on HAS_DMA
  crypto: atmel - CRYPTO_DEV_ATMEL_TDES and CRYPTO_DEV_ATMEL_SHA should depend on HAS_DMA
  crypto: cavium - fix leak on curr if curr->head fails to be allocated
  crypto: cavium - Fix couple of static checker errors
parents 0710f3ff 5839f555

arch/arm/crypto/Makefile

+11 −1
Original line number Diff line number Diff line
@@ -15,7 +15,17 @@ ce-obj-$(CONFIG_CRYPTO_SHA1_ARM_CE) += sha1-arm-ce.o 
ce-obj-$(CONFIG_CRYPTO_SHA2_ARM_CE) += sha2-arm-ce.o

ce-obj-$(CONFIG_CRYPTO_GHASH_ARM_CE) += ghash-arm-ce.o

ce-obj-$(CONFIG_CRYPTO_CRCT10DIF_ARM_CE) += crct10dif-arm-ce.o

ce-obj-$(CONFIG_CRYPTO_CRC32_ARM_CE) += crc32-arm-ce.o

crc-obj-$(CONFIG_CRYPTO_CRC32_ARM_CE) += crc32-arm-ce.o



ifneq ($(crc-obj-y)$(crc-obj-m),)

ifeq ($(call as-instr,.arch armv8-a\n.arch_extension crc,y,n),y)

ce-obj-y += $(crc-obj-y)

ce-obj-m += $(crc-obj-m)

else

$(warning These CRC Extensions modules need binutils 2.23 or higher)

$(warning $(crc-obj-y) $(crc-obj-m))

endif

endif



ifneq ($(ce-obj-y)$(ce-obj-m),)

ifeq ($(call as-instr,.fpu crypto-neon-fp-armv8,y,n),y)

arch/arm/crypto/crc32-ce-core.S

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ ENTRY(crc32c_pmull_le) 
	vld1.8		{q3-q4}, [BUF, :128]!

	vmov.i8		qzr, #0

	vmov.i8		qCONSTANT, #0

	vmov		dCONSTANTl[0], CRC

	vmov.32		dCONSTANTl[0], CRC

	veor.8		d2, d2, dCONSTANTl

	sub		LEN, LEN, #0x40

	cmp		LEN, #0x40

crypto/ccm.c

+3 −2
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ struct crypto_rfc4309_req_ctx { 


struct crypto_ccm_req_priv_ctx {

	u8 odata[16];

	u8 idata[16];

	u8 auth_tag[16];

	u32 flags;

	struct scatterlist src[3];
@@ -183,8 +184,8 @@ static int crypto_ccm_auth(struct aead_request *req, struct scatterlist *plain, 
	AHASH_REQUEST_ON_STACK(ahreq, ctx->mac);

	unsigned int assoclen = req->assoclen;

	struct scatterlist sg[3];

	u8 odata[16];

	u8 idata[16];

	u8 *odata = pctx->odata;

	u8 *idata = pctx->idata;

	int ilen, err;



	/* format control data for input */

crypto/testmgr.h

+1 −1
Original line number Diff line number Diff line
@@ -22691,7 +22691,7 @@ static struct aead_testvec aes_ccm_enc_tv_template[] = { 
			  "\x09\x75\x9a\x9b\x3c\x9b\x27\x39",

		.klen	= 32,

		.iv	= "\x03\xf9\xd9\x4e\x63\xb5\x3d\x9d"

			  "\x43\xf6\x1e\x50",

			  "\x43\xf6\x1e\x50\0\0\0\0",

		.assoc	= "\x57\xf5\x6b\x8b\x57\x5c\x3d\x3b"

			  "\x13\x02\x01\x0c\x83\x4c\x96\x35"

			  "\x8e\xd6\x39\xcf\x7d\x14\x9b\x94"

crypto/xts.c

+8 −6
Original line number Diff line number Diff line
@@ -463,6 +463,7 @@ static int create(struct crypto_template *tmpl, struct rtattr **tb) 
	struct xts_instance_ctx *ctx;

	struct skcipher_alg *alg;

	const char *cipher_name;

	u32 mask;

	int err;



	algt = crypto_get_attr_type(tb);
@@ -483,18 +484,19 @@ static int create(struct crypto_template *tmpl, struct rtattr **tb) 
	ctx = skcipher_instance_ctx(inst);



	crypto_set_skcipher_spawn(&ctx->spawn, skcipher_crypto_instance(inst));

	err = crypto_grab_skcipher(&ctx->spawn, cipher_name, 0,

				   crypto_requires_sync(algt->type,

							algt->mask));



	mask = crypto_requires_off(algt->type, algt->mask,

				   CRYPTO_ALG_NEED_FALLBACK |

				   CRYPTO_ALG_ASYNC);



	err = crypto_grab_skcipher(&ctx->spawn, cipher_name, 0, mask);

	if (err == -ENOENT) {

		err = -ENAMETOOLONG;

		if (snprintf(ctx->name, CRYPTO_MAX_ALG_NAME, "ecb(%s)",

			     cipher_name) >= CRYPTO_MAX_ALG_NAME)

			goto err_free_inst;



		err = crypto_grab_skcipher(&ctx->spawn, ctx->name, 0,

					   crypto_requires_sync(algt->type,

								algt->mask));

		err = crypto_grab_skcipher(&ctx->spawn, ctx->name, 0, mask);

	}



	if (err)

CRA Git | Maintained and supported by SUSTech CRA and CCSE