Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Jul 2018 14:32:44 +0000 (07:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Jul 2018 14:32:44 +0000 (07:32 -0700)
commitb4394c34356180adb783a5cba2aee469e76a52ff
tree090470e250b8d95ffd5acfc947cf877102de0eac
parent024ddc0ce1049298bd3cae60ae45d9c5f0fb8b9c
parent2546da99212f22034aecf279da9c47cbfac6c981
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "This fixes an allocation error-path bug in af_alg discovered by
  syzkaller"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: af_alg - Initialize sg_num_bytes in error code path
crypto/af_alg.c