]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit - block/blk-map.c
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Jan 2018 17:47:58 +0000 (09:47 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Jan 2018 17:47:58 +0000 (09:47 -0800)
commit70cd9071e8fbe5eb88e02891bccfe20ae1f52630
treedbc50cf0619ff7bcd0e2af3caa589719cd444a65
parentf12e0dd0d7c7a82a66621d8e49fd9ecec0b18e19
parent9a00674213a3f00394f4e3221b88f2d21fc05789
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "This fixes a NULL pointer dereference in crypto_remove_spawns that can
  be triggered through af_alg"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: algapi - fix NULL dereference in crypto_remove_spawns()