Commit 6662df33 authored by David S. Miller's avatar David S. Miller
Browse files

crypto: Stop using NLA_PUT*(). 



These macros contain a hidden goto, and are thus extremely error
prone and make code hard to audit.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b21dddb9

crypto/ablkcipher.c

+6 −6
Original line number Diff line number Diff line
@@ -397,9 +397,9 @@ static int crypto_ablkcipher_report(struct sk_buff *skb, struct crypto_alg *alg) 
	rblkcipher.max_keysize = alg->cra_ablkcipher.max_keysize;

	rblkcipher.ivsize = alg->cra_ablkcipher.ivsize;



	NLA_PUT(skb, CRYPTOCFGA_REPORT_BLKCIPHER,

		sizeof(struct crypto_report_blkcipher), &rblkcipher);



	if (nla_put(skb, CRYPTOCFGA_REPORT_BLKCIPHER,

		    sizeof(struct crypto_report_blkcipher), &rblkcipher))

		goto nla_put_failure;

	return 0;



nla_put_failure:
@@ -478,9 +478,9 @@ static int crypto_givcipher_report(struct sk_buff *skb, struct crypto_alg *alg) 
	rblkcipher.max_keysize = alg->cra_ablkcipher.max_keysize;

	rblkcipher.ivsize = alg->cra_ablkcipher.ivsize;



	NLA_PUT(skb, CRYPTOCFGA_REPORT_BLKCIPHER,

		sizeof(struct crypto_report_blkcipher), &rblkcipher);



	if (nla_put(skb, CRYPTOCFGA_REPORT_BLKCIPHER,

		    sizeof(struct crypto_report_blkcipher), &rblkcipher))

		goto nla_put_failure;

	return 0;



nla_put_failure:

crypto/aead.c

+6 −6
Original line number Diff line number Diff line
@@ -125,9 +125,9 @@ static int crypto_aead_report(struct sk_buff *skb, struct crypto_alg *alg) 
	raead.maxauthsize = aead->maxauthsize;

	raead.ivsize = aead->ivsize;



	NLA_PUT(skb, CRYPTOCFGA_REPORT_AEAD,

		sizeof(struct crypto_report_aead), &raead);



	if (nla_put(skb, CRYPTOCFGA_REPORT_AEAD,

		    sizeof(struct crypto_report_aead), &raead))

		goto nla_put_failure;

	return 0;



nla_put_failure:
@@ -210,9 +210,9 @@ static int crypto_nivaead_report(struct sk_buff *skb, struct crypto_alg *alg) 
	raead.maxauthsize = aead->maxauthsize;

	raead.ivsize = aead->ivsize;



	NLA_PUT(skb, CRYPTOCFGA_REPORT_AEAD,

		sizeof(struct crypto_report_aead), &raead);



	if (nla_put(skb, CRYPTOCFGA_REPORT_AEAD,

		    sizeof(struct crypto_report_aead), &raead))

		goto nla_put_failure;

	return 0;



nla_put_failure:

crypto/ahash.c

+3 −3
Original line number Diff line number Diff line
@@ -409,9 +409,9 @@ static int crypto_ahash_report(struct sk_buff *skb, struct crypto_alg *alg) 
	rhash.blocksize = alg->cra_blocksize;

	rhash.digestsize = __crypto_hash_alg_common(alg)->digestsize;



	NLA_PUT(skb, CRYPTOCFGA_REPORT_HASH,

		sizeof(struct crypto_report_hash), &rhash);



	if (nla_put(skb, CRYPTOCFGA_REPORT_HASH,

		    sizeof(struct crypto_report_hash), &rhash))

		goto nla_put_failure;

	return 0;



nla_put_failure:

crypto/blkcipher.c

+3 −3
Original line number Diff line number Diff line
@@ -508,9 +508,9 @@ static int crypto_blkcipher_report(struct sk_buff *skb, struct crypto_alg *alg) 
	rblkcipher.max_keysize = alg->cra_blkcipher.max_keysize;

	rblkcipher.ivsize = alg->cra_blkcipher.ivsize;



	NLA_PUT(skb, CRYPTOCFGA_REPORT_BLKCIPHER,

		sizeof(struct crypto_report_blkcipher), &rblkcipher);



	if (nla_put(skb, CRYPTOCFGA_REPORT_BLKCIPHER,

		    sizeof(struct crypto_report_blkcipher), &rblkcipher))

		goto nla_put_failure;

	return 0;



nla_put_failure:

crypto/crypto_user.c

+11 −11
Original line number Diff line number Diff line
@@ -77,9 +77,9 @@ static int crypto_report_cipher(struct sk_buff *skb, struct crypto_alg *alg) 
	rcipher.min_keysize = alg->cra_cipher.cia_min_keysize;

	rcipher.max_keysize = alg->cra_cipher.cia_max_keysize;



	NLA_PUT(skb, CRYPTOCFGA_REPORT_CIPHER,

		sizeof(struct crypto_report_cipher), &rcipher);



	if (nla_put(skb, CRYPTOCFGA_REPORT_CIPHER,

		    sizeof(struct crypto_report_cipher), &rcipher))

		goto nla_put_failure;

	return 0;



nla_put_failure:
@@ -92,9 +92,9 @@ static int crypto_report_comp(struct sk_buff *skb, struct crypto_alg *alg) 


	snprintf(rcomp.type, CRYPTO_MAX_ALG_NAME, "%s", "compression");



	NLA_PUT(skb, CRYPTOCFGA_REPORT_COMPRESS,

		sizeof(struct crypto_report_comp), &rcomp);



	if (nla_put(skb, CRYPTOCFGA_REPORT_COMPRESS,

		    sizeof(struct crypto_report_comp), &rcomp))

		goto nla_put_failure;

	return 0;



nla_put_failure:
@@ -113,16 +113,16 @@ static int crypto_report_one(struct crypto_alg *alg, 
	ualg->cru_flags = alg->cra_flags;

	ualg->cru_refcnt = atomic_read(&alg->cra_refcnt);



	NLA_PUT_U32(skb, CRYPTOCFGA_PRIORITY_VAL, alg->cra_priority);



	if (nla_put_u32(skb, CRYPTOCFGA_PRIORITY_VAL, alg->cra_priority))

		goto nla_put_failure;

	if (alg->cra_flags & CRYPTO_ALG_LARVAL) {

		struct crypto_report_larval rl;



		snprintf(rl.type, CRYPTO_MAX_ALG_NAME, "%s", "larval");



		NLA_PUT(skb, CRYPTOCFGA_REPORT_LARVAL,

			sizeof(struct crypto_report_larval), &rl);



		if (nla_put(skb, CRYPTOCFGA_REPORT_LARVAL,

			    sizeof(struct crypto_report_larval), &rl))

			goto nla_put_failure;

		goto out;

	}