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)
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

1  2 
crypto/af_alg.c

diff --cc crypto/af_alg.c
Simple merge