Commit 6929c358 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'llvmlinux-for-v3.18' of git://git.linuxfoundation.org/llvmlinux/kernel 

Pull LLVM updates from Behan Webster:
 "These patches remove the use of VLAIS using a new SHASH_DESC_ON_STACK
  macro.

  Some of the previously accepted VLAIS removal patches haven't used
  this macro.  I will push new patches to consistently use this macro in
  all those older cases for 3.19"

[ More LLVM patches coming in through subsystem trees, and LLVM itself
  needs some fixes that are already in many distributions but not in
  released versions of LLVM.  Some day this will all "just work"  - Linus ]

* tag 'llvmlinux-for-v3.18' of git://git.linuxfoundation.org/llvmlinux/kernel:
  crypto: LLVMLinux: Remove VLAIS usage from crypto/testmgr.c
  security, crypto: LLVMLinux: Remove VLAIS from ima_crypto.c
  crypto: LLVMLinux: Remove VLAIS usage from libcrc32c.c
  crypto: LLVMLinux: Remove VLAIS usage from crypto/hmac.c
  crypto, dm: LLVMLinux: Remove VLAIS usage from dm-crypt
  crypto: LLVMLinux: Remove VLAIS from crypto/.../qat_algs.c
  crypto: LLVMLinux: Remove VLAIS from crypto/omap_sham.c
  crypto: LLVMLinux: Remove VLAIS from crypto/n2_core.c
  crypto: LLVMLinux: Remove VLAIS from crypto/mv_cesa.c
  crypto: LLVMLinux: Remove VLAIS from crypto/ccp/ccp-crypto-sha.c
  btrfs: LLVMLinux: Remove VLAIS
  crypto: LLVMLinux: Add macro to remove use of VLAIS in crypto code
parents 23971bdf 4c5c3024

crypto/hmac.c

+11 −14
Original line number Diff line number Diff line
@@ -52,20 +52,17 @@ static int hmac_setkey(struct crypto_shash *parent, 
	struct hmac_ctx *ctx = align_ptr(opad + ss,

					 crypto_tfm_ctx_alignment());

	struct crypto_shash *hash = ctx->hash;

	struct {

		struct shash_desc shash;

		char ctx[crypto_shash_descsize(hash)];

	} desc;

	SHASH_DESC_ON_STACK(shash, hash);

	unsigned int i;



	desc.shash.tfm = hash;

	desc.shash.flags = crypto_shash_get_flags(parent) &

			    CRYPTO_TFM_REQ_MAY_SLEEP;

	shash->tfm = hash;

	shash->flags = crypto_shash_get_flags(parent)

		& CRYPTO_TFM_REQ_MAY_SLEEP;



	if (keylen > bs) {

		int err;



		err = crypto_shash_digest(&desc.shash, inkey, keylen, ipad);

		err = crypto_shash_digest(shash, inkey, keylen, ipad);

		if (err)

			return err;
@@ -81,12 +78,12 @@ static int hmac_setkey(struct crypto_shash *parent, 
		opad[i] ^= 0x5c;

	}



	return crypto_shash_init(&desc.shash) ?:

	       crypto_shash_update(&desc.shash, ipad, bs) ?:

	       crypto_shash_export(&desc.shash, ipad) ?:

	       crypto_shash_init(&desc.shash) ?:

	       crypto_shash_update(&desc.shash, opad, bs) ?:

	       crypto_shash_export(&desc.shash, opad);

	return crypto_shash_init(shash) ?:

	       crypto_shash_update(shash, ipad, bs) ?:

	       crypto_shash_export(shash, ipad) ?:

	       crypto_shash_init(shash) ?:

	       crypto_shash_update(shash, opad, bs) ?:

	       crypto_shash_export(shash, opad);

}



static int hmac_export(struct shash_desc *pdesc, void *out)

crypto/testmgr.c

+6 −8
Original line number Diff line number Diff line
@@ -1678,16 +1678,14 @@ static int alg_test_crc32c(const struct alg_test_desc *desc, 
	}



	do {

		struct {

			struct shash_desc shash;

			char ctx[crypto_shash_descsize(tfm)];

		} sdesc;

		SHASH_DESC_ON_STACK(shash, tfm);

		u32 *ctx = (u32 *)shash_desc_ctx(shash);



		sdesc.shash.tfm = tfm;

		sdesc.shash.flags = 0;

		shash->tfm = tfm;

		shash->flags = 0;



		*(u32 *)sdesc.ctx = le32_to_cpu(420553207);

		err = crypto_shash_final(&sdesc.shash, (u8 *)&val);

		*ctx = le32_to_cpu(420553207);

		err = crypto_shash_final(shash, (u8 *)&val);

		if (err) {

			printk(KERN_ERR "alg: crc32c: Operation failed for "

			       "%s: %d\n", driver, err);

drivers/crypto/ccp/ccp-crypto-sha.c

+6 −7
Original line number Diff line number Diff line
@@ -198,10 +198,9 @@ static int ccp_sha_setkey(struct crypto_ahash *tfm, const u8 *key, 
{

	struct ccp_ctx *ctx = crypto_tfm_ctx(crypto_ahash_tfm(tfm));

	struct crypto_shash *shash = ctx->u.sha.hmac_tfm;

	struct {

		struct shash_desc sdesc;

		char ctx[crypto_shash_descsize(shash)];

	} desc;



	SHASH_DESC_ON_STACK(sdesc, shash);



	unsigned int block_size = crypto_shash_blocksize(shash);

	unsigned int digest_size = crypto_shash_digestsize(shash);

	int i, ret;
@@ -216,11 +215,11 @@ static int ccp_sha_setkey(struct crypto_ahash *tfm, const u8 *key, 


	if (key_len > block_size) {

		/* Must hash the input key */

		desc.sdesc.tfm = shash;

		desc.sdesc.flags = crypto_ahash_get_flags(tfm) &

		sdesc->tfm = shash;

		sdesc->flags = crypto_ahash_get_flags(tfm) &

			CRYPTO_TFM_REQ_MAY_SLEEP;



		ret = crypto_shash_digest(&desc.sdesc, key, key_len,

		ret = crypto_shash_digest(sdesc, key, key_len,

					  ctx->u.sha.key);

		if (ret) {

			crypto_ahash_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);

drivers/crypto/mv_cesa.c

+18 −23
Original line number Diff line number Diff line
@@ -402,26 +402,23 @@ static int mv_hash_final_fallback(struct ahash_request *req) 
{

	const struct mv_tfm_hash_ctx *tfm_ctx = crypto_tfm_ctx(req->base.tfm);

	struct mv_req_hash_ctx *req_ctx = ahash_request_ctx(req);

	struct {

		struct shash_desc shash;

		char ctx[crypto_shash_descsize(tfm_ctx->fallback)];

	} desc;

	SHASH_DESC_ON_STACK(shash, tfm_ctx->fallback);

	int rc;



	desc.shash.tfm = tfm_ctx->fallback;

	desc.shash.flags = CRYPTO_TFM_REQ_MAY_SLEEP;

	shash->tfm = tfm_ctx->fallback;

	shash->flags = CRYPTO_TFM_REQ_MAY_SLEEP;

	if (unlikely(req_ctx->first_hash)) {

		crypto_shash_init(&desc.shash);

		crypto_shash_update(&desc.shash, req_ctx->buffer,

		crypto_shash_init(shash);

		crypto_shash_update(shash, req_ctx->buffer,

				    req_ctx->extra_bytes);

	} else {

		/* only SHA1 for now....

		 */

		rc = mv_hash_import_sha1_ctx(req_ctx, &desc.shash);

		rc = mv_hash_import_sha1_ctx(req_ctx, shash);

		if (rc)

			goto out;

	}

	rc = crypto_shash_final(&desc.shash, req->result);

	rc = crypto_shash_final(shash, req->result);

out:

	return rc;

}
@@ -794,23 +791,21 @@ static int mv_hash_setkey(struct crypto_ahash *tfm, const u8 * key, 
	ss = crypto_shash_statesize(ctx->base_hash);



	{

		struct {

			struct shash_desc shash;

			char ctx[crypto_shash_descsize(ctx->base_hash)];

		} desc;

		SHASH_DESC_ON_STACK(shash, ctx->base_hash);



		unsigned int i;

		char ipad[ss];

		char opad[ss];



		desc.shash.tfm = ctx->base_hash;

		desc.shash.flags = crypto_shash_get_flags(ctx->base_hash) &

		shash->tfm = ctx->base_hash;

		shash->flags = crypto_shash_get_flags(ctx->base_hash) &

		    CRYPTO_TFM_REQ_MAY_SLEEP;



		if (keylen > bs) {

			int err;



			err =

			    crypto_shash_digest(&desc.shash, key, keylen, ipad);

			    crypto_shash_digest(shash, key, keylen, ipad);

			if (err)

				return err;
@@ -826,12 +821,12 @@ static int mv_hash_setkey(struct crypto_ahash *tfm, const u8 * key, 
			opad[i] ^= 0x5c;

		}



		rc = crypto_shash_init(&desc.shash) ? :

		    crypto_shash_update(&desc.shash, ipad, bs) ? :

		    crypto_shash_export(&desc.shash, ipad) ? :

		    crypto_shash_init(&desc.shash) ? :

		    crypto_shash_update(&desc.shash, opad, bs) ? :

		    crypto_shash_export(&desc.shash, opad);

		rc = crypto_shash_init(shash) ? :

		    crypto_shash_update(shash, ipad, bs) ? :

		    crypto_shash_export(shash, ipad) ? :

		    crypto_shash_init(shash) ? :

		    crypto_shash_update(shash, opad, bs) ? :

		    crypto_shash_export(shash, opad);



		if (rc == 0)

			mv_hash_init_ivs(ctx, ipad, opad);

drivers/crypto/n2_core.c

+4 −7
Original line number Diff line number Diff line
@@ -445,10 +445,7 @@ static int n2_hmac_async_setkey(struct crypto_ahash *tfm, const u8 *key, 
	struct n2_hmac_ctx *ctx = crypto_ahash_ctx(tfm);

	struct crypto_shash *child_shash = ctx->child_shash;

	struct crypto_ahash *fallback_tfm;

	struct {

		struct shash_desc shash;

		char ctx[crypto_shash_descsize(child_shash)];

	} desc;

	SHASH_DESC_ON_STACK(shash, child_shash);

	int err, bs, ds;



	fallback_tfm = ctx->base.fallback_tfm;
@@ -456,15 +453,15 @@ static int n2_hmac_async_setkey(struct crypto_ahash *tfm, const u8 *key, 
	if (err)

		return err;



	desc.shash.tfm = child_shash;

	desc.shash.flags = crypto_ahash_get_flags(tfm) &

	shash->tfm = child_shash;

	shash->flags = crypto_ahash_get_flags(tfm) &

		CRYPTO_TFM_REQ_MAY_SLEEP;



	bs = crypto_shash_blocksize(child_shash);

	ds = crypto_shash_digestsize(child_shash);

	BUG_ON(ds > N2_HASH_KEY_MAX);

	if (keylen > bs) {

		err = crypto_shash_digest(&desc.shash, key, keylen,

		err = crypto_shash_digest(shash, key, keylen,

					  ctx->hash_key);

		if (err)

			return err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE