diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-29 20:06:26 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-29 20:06:26 +0300 |
| commit | 2cfa46dadd203eef88cc70131df7a81ebc34b8ff (patch) | |
| tree | 22a5ef040f6407cec847249ace82de3b2af0f5ec /kernel | |
| parent | b6509f6a8c4313c068c69785c001451415969e44 (diff) | |
| parent | e04ec0de61c1eb9693179093e83ab8ca68a30d08 (diff) | |
| download | linux-2cfa46dadd203eef88cc70131df7a81ebc34b8ff.tar.xz | |
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 'kernel')
| -rw-r--r-- | kernel/padata.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/padata.c b/kernel/padata.c index 29fc5d87a4cd..4373f7adaa40 100644 --- a/kernel/padata.c +++ b/kernel/padata.c @@ -335,7 +335,7 @@ static void padata_reorder(struct parallel_data *pd) * * Ensure reorder queue is read after pd->lock is dropped so we see * new objects from another task in padata_do_serial. Pairs with - * smp_mb__after_atomic in padata_do_serial. + * smp_mb in padata_do_serial. */ smp_mb(); @@ -418,7 +418,7 @@ void padata_do_serial(struct padata_priv *padata) * with the trylock of pd->lock in padata_reorder. Pairs with smp_mb * in padata_reorder. */ - smp_mb__after_atomic(); + smp_mb(); padata_reorder(pd); } |