Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52ab2ec0 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:

 - Disable the new crypto stats interface as it's still being changed

 - Fix potential uses-after-free in cbc/cfb/pcbc.

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: user - Disable statistics interface
  crypto: do not free algorithm before using
parents 7b24f6c0 e61efff4

crypto/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1812,7 +1812,7 @@ config CRYPTO_USER_API_AEAD 
	  cipher algorithms.



config CRYPTO_STATS

	bool "Crypto usage statistics for User-space"

	bool

	help

	  This option enables the gathering of crypto stats.

	  This will collect:

crypto/cbc.c

+4 −2
Original line number Diff line number Diff line
@@ -140,9 +140,8 @@ static int crypto_cbc_create(struct crypto_template *tmpl, struct rtattr **tb) 
	spawn = skcipher_instance_ctx(inst);

	err = crypto_init_spawn(spawn, alg, skcipher_crypto_instance(inst),

				CRYPTO_ALG_TYPE_MASK);

	crypto_mod_put(alg);

	if (err)

		goto err_free_inst;

		goto err_put_alg;



	err = crypto_inst_setname(skcipher_crypto_instance(inst), "cbc", alg);

	if (err)
@@ -174,12 +173,15 @@ static int crypto_cbc_create(struct crypto_template *tmpl, struct rtattr **tb) 
	err = skcipher_register_instance(tmpl, inst);

	if (err)

		goto err_drop_spawn;

	crypto_mod_put(alg);



out:

	return err;



err_drop_spawn:

	crypto_drop_spawn(spawn);

err_put_alg:

	crypto_mod_put(alg);

err_free_inst:

	kfree(inst);

	goto out;

crypto/cfb.c

+4 −2
Original line number Diff line number Diff line
@@ -286,9 +286,8 @@ static int crypto_cfb_create(struct crypto_template *tmpl, struct rtattr **tb) 
	spawn = skcipher_instance_ctx(inst);

	err = crypto_init_spawn(spawn, alg, skcipher_crypto_instance(inst),

				CRYPTO_ALG_TYPE_MASK);

	crypto_mod_put(alg);

	if (err)

		goto err_free_inst;

		goto err_put_alg;



	err = crypto_inst_setname(skcipher_crypto_instance(inst), "cfb", alg);

	if (err)
@@ -317,12 +316,15 @@ static int crypto_cfb_create(struct crypto_template *tmpl, struct rtattr **tb) 
	err = skcipher_register_instance(tmpl, inst);

	if (err)

		goto err_drop_spawn;

	crypto_mod_put(alg);



out:

	return err;



err_drop_spawn:

	crypto_drop_spawn(spawn);

err_put_alg:

	crypto_mod_put(alg);

err_free_inst:

	kfree(inst);

	goto out;

crypto/pcbc.c

+4 −2
Original line number Diff line number Diff line
@@ -244,9 +244,8 @@ static int crypto_pcbc_create(struct crypto_template *tmpl, struct rtattr **tb) 
	spawn = skcipher_instance_ctx(inst);

	err = crypto_init_spawn(spawn, alg, skcipher_crypto_instance(inst),

				CRYPTO_ALG_TYPE_MASK);

	crypto_mod_put(alg);

	if (err)

		goto err_free_inst;

		goto err_put_alg;



	err = crypto_inst_setname(skcipher_crypto_instance(inst), "pcbc", alg);

	if (err)
@@ -275,12 +274,15 @@ static int crypto_pcbc_create(struct crypto_template *tmpl, struct rtattr **tb) 
	err = skcipher_register_instance(tmpl, inst);

	if (err)

		goto err_drop_spawn;

	crypto_mod_put(alg);



out:

	return err;



err_drop_spawn:

	crypto_drop_spawn(spawn);

err_put_alg:

	crypto_mod_put(alg);

err_free_inst:

	kfree(inst);

	goto out;