summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-06-29 10:06:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-06-29 10:06:26 -0700
commit2cfa46dadd203eef88cc70131df7a81ebc34b8ff (patch)
tree22a5ef040f6407cec847249ace82de3b2af0f5ec /kernel
parentb6509f6a8c4313c068c69785c001451415969e44 (diff)
parente04ec0de61c1eb9693179093e83ab8ca68a30d08 (diff)
downloadlinux-2cfa46dadd203eef88cc70131df7a81ebc34b8ff.tar.bz2
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.c4
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);
}