linux-stable.git/drivers/crypto/caam, branch linux-3.2.y

crypto: caam - fix AEAD givenc descriptors

2017-03-16T02:18:25+00:00

commit d128af17876d79b87edf048303f98b35f6a53dbc upstream.

The AEAD givenc descriptor relies on moving the IV through the
output FIFO and then back to the CTX2 for authentication. The
SEQ FIFO STORE could be scheduled before the data can be
read from OFIFO, especially since the SEQ FIFO LOAD needs
to wait for the SEQ FIFO LOAD SKIP to finish first. The
SKIP takes more time when the input is SG than when it's
a contiguous buffer. If the SEQ FIFO LOAD is not scheduled
before the STORE, the DECO will hang waiting for data
to be available in the OFIFO so it can be transferred to C2.
In order to overcome this, first force transfer of IV to C2
by starting the "cryptlen" transfer first and then starting to
store data from OFIFO to the output buffer.

Fixes: 1acebad3d8db8 ("crypto: caam - faster aead implementation")
Signed-off-by: Alex Porosanu 
Signed-off-by: Horia Geantă 
Signed-off-by: Herbert Xu 
Signed-off-by: Ben Hutchings

crypto: caam - add allocation failure handling in SPRINTFCAT macro

2014-06-09T12:29:02+00:00

commit 27c5fb7a84242b66bf1e0b2fe6bf40d19bcc5c04 upstream.

GFP_ATOMIC memory allocation could fail.
In this case, avoid NULL pointer dereference and notify user.

Cc: Kim Phillips 
Signed-off-by: Horia Geanta 
Signed-off-by: Herbert Xu 
Signed-off-by: Ben Hutchings

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

2011-07-25T19:53:15+00:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  fs: take the ACL checks to common code
  bury posix_acl_..._masq() variants
  kill boilerplates around posix_acl_create_masq()
  generic_acl: no need to clone acl just to push it to set_cached_acl()
  kill boilerplate around posix_acl_chmod_masq()
  reiserfs: cache negative ACLs for v1 stat format
  xfs: cache negative ACLs if there is no attribute fork
  9p: do no return 0 from ->check_acl without actually checking
  vfs: move ACL cache lookup into generic code
  CIFS: Fix oops while mounting with prefixpath
  xfs: Fix wrong return value of xfs_file_aio_write
  fix devtmpfs race
  caam: don't pass bogus S_IFCHR to debugfs_create_...()
  get rid of create_proc_entry() abuses - proc_mkdir() is there for purpose
  asus-wmi: ->is_visible() can't return negative
  fix jffs2 ACLs on big-endian with 16bit mode_t
  9p: close ACL leaks
  ocfs2_init_acl(): fix a leak
  VFS : mount lock scalability for internal mounts

caam: don't pass bogus S_IFCHR to debugfs_create_...()

2011-07-24T14:12:42+00:00

it will be replaced with S_IFREG anyway

Signed-off-by: Al Viro

crypto: caam - ablkcipher support

2011-07-15T03:21:42+00:00

caam now supports encrypt and decrypt
for aes, des and 3des

Signed-off-by: Yuan Kang 
Signed-off-by: Kim Phillips 
Signed-off-by: Herbert Xu

crypto: caam - faster aead implementation

2011-07-15T03:21:42+00:00

Job descriptors only contain header and seq pointers.

Other commands are stored in separate shared descriptors
for encrypt, decrypt and givencrypt, stored as arrays
in caam_ctx.

This requires additional macros to create math commands
to calculate assoclen and cryptlen.

Signed-off-by: Yuan Kang 
Signed-off-by: Kim Phillips 
Signed-off-by: Herbert Xu

crypto: caam - structure renaming

2011-07-15T03:21:41+00:00

caam_ctx.key_phys to key_dma

caam_alg_template supports multiple algorithm types
listed in union, which requires cases for
different types in function caam_alg_alloc

Signed-off-by: Yuan Kang 
Signed-off-by: Kim Phillips 
Signed-off-by: Herbert Xu

crypto: caam - shorter names

2011-07-15T03:21:41+00:00

"aead_authenc" and "ipsec_esp" changed to "aead,"
except for function "ipsec_esp," which is changed
to "init_aead_job."

Variable name of aead_request structures changed
to "req" and name of aead_givcrypt_request structure
changed to "areq"

Signed-off-by: Yuan Kang 
Signed-off-by: Kim Phillips 
Signed-off-by: Herbert Xu

crypto: caam - fix build warning when DEBUG_FS not configured

2011-06-29T23:44:05+00:00

drivers/crypto/caam/ctrl.c: In function 'caam_probe':
drivers/crypto/caam/ctrl.c:55:23: warning: unused variable 'perfmon'

Signed-off-by: Kim Phillips 
Signed-off-by: Herbert Xu

crypto: caam - fix operator precedence in shared descriptor allocation

2011-06-29T23:43:27+00:00

setkey allocates 16 bytes (CAAM_CMD_SZ *
DESC_AEAD_SHARED_TEXT_LEN) shy of what is needed to
store the shared descriptor, resulting in memory
corruption.  Fix this.

Signed-off-by: Kim Phillips 
Signed-off-by: Herbert Xu