Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Browse source

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

...

This commit is contained in:

Linus Torvalds 2015-07-13 10:33:22 -07:00

parent bc0195aad0 030f4e9687

commit 34bef46e78

9 changed files with 125 additions and 82 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

drivers/crypto/nx/nx-aes-ccm.c

View file

7

drivers/crypto/nx/nx-aes-ctr.c

View file

17

drivers/crypto/nx/nx-aes-gcm.c

View file

70

drivers/crypto/nx/nx-aes-xcbc.c

View file

43

drivers/crypto/nx/nx-sha256.c

View file

44

drivers/crypto/nx/nx-sha512.c

View file

3

drivers/crypto/nx/nx.c

View file

14

drivers/crypto/nx/nx.h

View file

3

drivers/crypto/omap-des.c

View file