From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 Jul 2018 14:32:44 +0000 (-0700)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v5.15~8421
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b4394c34356180adb783a5cba2aee469e76a52ff;p=platform%2Fkernel%2Flinux-starfive.git

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

b4394c34356180adb783a5cba2aee469e76a52ff