diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-29 11:34:18 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-29 11:34:18 -0700 |
commit | 133841cab7817f110c35fd97032a6a9d66a3e9e2 (patch) | |
tree | d08bd4a1c7e0a61ea0b59840b03f14604d8ae79f /crypto/api.c | |
parent | 65544319372b33d2eed7c56b4864122ad0074670 (diff) | |
parent | 939e17799619e31331d2433041196529515a86a6 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu:
"This fixes a crash in the crypto layer exposed by an SCTP test tool"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: algboss - Hold ref count on larval
Diffstat (limited to 'crypto/api.c')
-rw-r--r-- | crypto/api.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/crypto/api.c b/crypto/api.c index 033a7147e5e..3b6180336d3 100644 --- a/crypto/api.c +++ b/crypto/api.c @@ -34,12 +34,6 @@ EXPORT_SYMBOL_GPL(crypto_alg_sem); BLOCKING_NOTIFIER_HEAD(crypto_chain); EXPORT_SYMBOL_GPL(crypto_chain); -static inline struct crypto_alg *crypto_alg_get(struct crypto_alg *alg) -{ - atomic_inc(&alg->cra_refcnt); - return alg; -} - struct crypto_alg *crypto_mod_get(struct crypto_alg *alg) { return try_module_get(alg->cra_module) ? crypto_alg_get(alg) : NULL; |