Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Browse source

Pull crypto fixes from Herbert Xu:
 "This fixes the following issues:

   - Missing length check for user-space GETALG request
   - Bogus memmove length in ux500 driver
   - Incorrect priority setting for vmx driver
   - Incorrect ABI selection for vmx driver"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: user - re-add size check for CRYPTO_MSG_GETALG
  crypto: ux500 - memmove the right size
  crypto: vmx - Increase priority of aes-cbc cipher
  crypto: vmx - Fix ABI detection

...

This commit is contained in:

Linus Torvalds 2016-06-27 10:59:53 -07:00

parent 4c2e07c6a2 055ddaace0

commit 5b7452c840

5 changed files with 6 additions and 5 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

1

crypto/crypto_user.c

View file

4

drivers/crypto/ux500/hash/hash_core.c

View file

2

drivers/crypto/vmx/aes_cbc.c

View file

2

drivers/crypto/vmx/aes_ctr.c

View file

2

drivers/crypto/vmx/ppc-xlate.pl

View file