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/locks.c | |
| parent | 2c7143d4f5cd5c31c7ebe7aa57b273145cdb1808 (diff) | |
| parent | 0d96e4bab2855a030077cc695a3563fd7cb0e7d8 (diff) | |
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/locks.c')
0 files changed, 0 insertions, 0 deletions