diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-29 19:06:26 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-29 19:06:26 +0200 |
| commit | 2cfa46dadd203eef88cc70131df7a81ebc34b8ff (patch) | |
| tree | 22a5ef040f6407cec847249ace82de3b2af0f5ec /include | |
| parent | Revert "fs: Do not check if there is a fsnotify watcher on pseudo inodes" (diff) | |
| parent | padata: upgrade smp_mb__after_atomic to smp_mb in padata_do_serial (diff) | |
| download | linux-2cfa46dadd203eef88cc70131df7a81ebc34b8ff.tar.xz linux-2cfa46dadd203eef88cc70131df7a81ebc34b8ff.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes two race conditions, one in padata and one in af_alg"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
padata: upgrade smp_mb__after_atomic to smp_mb in padata_do_serial
crypto: af_alg - fix use-after-free in af_alg_accept() due to bh_lock_sock()
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/if_alg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h index 56527c85d122..088c1ded2714 100644 --- a/include/crypto/if_alg.h +++ b/include/crypto/if_alg.h @@ -29,8 +29,8 @@ struct alg_sock { struct sock *parent; - unsigned int refcnt; - unsigned int nokey_refcnt; + atomic_t refcnt; + atomic_t nokey_refcnt; const struct af_alg_type *type; void *private; |