diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-22 14:34:22 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-25 12:41:25 +0200 |
| commit | a5a22e57f6d8f6f84bcf98dc11d44813e35caa11 (patch) | |
| tree | 108bf12be88f6b5fbc4eacfff9e9a5d8e1ede794 /crypto | |
| parent | crypto: aead - Add crypto_aead_alg_ivsize/maxauthsize (diff) | |
| download | linux-a5a22e57f6d8f6f84bcf98dc11d44813e35caa11.tar.xz linux-a5a22e57f6d8f6f84bcf98dc11d44813e35caa11.zip | |
crypto: pcrypt - Make tfm_count an atomic_t
The variable tfm_count is accessed by multiple threads without
locking. This patch converts it to an atomic_t.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/pcrypt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c index 3942a9f09045..ff174b61d820 100644 --- a/crypto/pcrypt.c +++ b/crypto/pcrypt.c @@ -20,6 +20,7 @@ #include <crypto/algapi.h> #include <crypto/internal/aead.h> +#include <linux/atomic.h> #include <linux/err.h> #include <linux/init.h> #include <linux/module.h> @@ -61,7 +62,7 @@ static struct kset *pcrypt_kset; struct pcrypt_instance_ctx { struct crypto_aead_spawn spawn; - unsigned int tfm_count; + atomic_t tfm_count; }; struct pcrypt_aead_ctx { @@ -278,9 +279,8 @@ static int pcrypt_aead_init_tfm(struct crypto_tfm *tfm) struct pcrypt_aead_ctx *ctx = crypto_tfm_ctx(tfm); struct crypto_aead *cipher; - ictx->tfm_count++; - - cpu_index = ictx->tfm_count % cpumask_weight(cpu_online_mask); + cpu_index = (unsigned int)atomic_inc_return(&ictx->tfm_count) % + cpumask_weight(cpu_online_mask); ctx->cb_cpu = cpumask_first(cpu_online_mask); for (cpu = 0; cpu < cpu_index; cpu++) |