diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-13 20:33:22 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-13 20:33:22 +0300 |
| commit | 34bef46e786ca6f884b8ed4be89e07b62f28ec3c (patch) | |
| tree | 7b8bcee0b8fb4ec18866e067d0164890f1dbcfac /security/apparmor/ipc.c | |
| parent | bc0195aad0daa2ad5b0d76cce22b167bc3435590 (diff) | |
| parent | 030f4e968741d65aea9cd5f7814d1164967801ef (diff) | |
| download | linux-34bef46e786ca6f884b8ed4be89e07b62f28ec3c.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes a duplicate dma_unmap_sg call in omap-des and reentrancy
bugs in the powerpc nx driver which may cause bogus output or worse
memory corruption"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: nx - Fix reentrancy bugs
crypto: omap-des - Fix unmapping of dma channels
Diffstat (limited to 'security/apparmor/ipc.c')
0 files changed, 0 insertions, 0 deletions