Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Jun 2020 17:06:26 +0000 (10:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Jun 2020 17:06:26 +0000 (10:06 -0700)
commit2cfa46dadd203eef88cc70131df7a81ebc34b8ff
tree22a5ef040f6407cec847249ace82de3b2af0f5ec
parentb6509f6a8c4313c068c69785c001451415969e44
parente04ec0de61c1eb9693179093e83ab8ca68a30d08
Merge branch 'linus' of git://git./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()