diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2015-12-28 10:44:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2015-12-28 10:44:41 -0800 |
| commit | 8513342170278468bac126640a5d2d12ffbff106 (patch) | |
| tree | 9241ea523ab870dac7e3e89d4844bcb2797f1cca /fs/ocfs2/resize.c | |
| parent | Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jm... (diff) | |
| parent | crypto: algif_skcipher - Use new skcipher interface (diff) | |
| download | linux-8513342170278468bac126640a5d2d12ffbff106.tar.gz linux-8513342170278468bac126640a5d2d12ffbff106.tar.bz2 linux-8513342170278468bac126640a5d2d12ffbff106.zip | |
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 bug in the algif_skcipher interface that can trigger a
kernel WARN_ON from user-space. It does so by using the new skcipher
interface which unlike the previous ablkcipher does not need to create
extra geniv objects which is what was used to trigger the WARN_ON"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: algif_skcipher - Use new skcipher interface
Diffstat (limited to 'fs/ocfs2/resize.c')
0 files changed, 0 insertions, 0 deletions