linux-stable.git/drivers/crypto, branch v3.16.35

crypto: ccp - memset request context to zero during import

2016-04-30T22:05:51+00:00

commit ce0ae266feaf35930394bd770c69778e4ef03ba9 upstream.

Since a crypto_ahash_import() can be called against a request context
that has not had a crypto_ahash_init() performed, the request context
needs to be cleared to insure there is no random data present. If not,
the random data can result in a kernel oops during crypto_ahash_update().

Signed-off-by: Tom Lendacky 
Signed-off-by: Herbert Xu 
Signed-off-by: Ben Hutchings

crypto: ccp - Don't assume export/import areas are aligned

2016-04-30T22:05:46+00:00

commit b31dde2a5cb1bf764282abf934266b7193c2bc7c upstream.

Use a local variable for the exported and imported state so that
alignment is not an issue. On export, set a local variable from the
request context and then memcpy the contents of the local variable to
the export memory area. On import, memcpy the import memory area into
a local variable and then use the local variable to set the request
context.

Signed-off-by: Tom Lendacky 
Signed-off-by: Herbert Xu 
Signed-off-by: Ben Hutchings

crypto: ccp - Limit the amount of information exported

2016-04-30T22:05:46+00:00

commit d1662165ae612ec8b5f94a6b07e65ea58b6dce34 upstream.

Since the exported information can be exposed to user-space, instead of
exporting the entire request context only export the minimum information
needed.

Signed-off-by: Tom Lendacky 
Signed-off-by: Herbert Xu 
Signed-off-by: Ben Hutchings

crypto: ccp - Add hash state import and export support

2016-04-30T22:05:44+00:00

commit 952bce9792e6bf36fda09c2e5718abb5d9327369 upstream.

Commit 8996eafdcbad ("crypto: ahash - ensure statesize is non-zero")
added a check to prevent ahash algorithms from successfully registering
if the import and export functions were not implemented. This prevents
an oops in the hash_accept function of algif_hash. This commit causes
the ccp-crypto module SHA support and AES CMAC support from successfully
registering and causing the ccp-crypto module load to fail because the
ahash import and export functions are not implemented.

Update the CCP Crypto API support to provide import and export support
for ahash algorithms.

Signed-off-by: Tom Lendacky 
Signed-off-by: Herbert Xu 
Signed-off-by: Ben Hutchings

crypto: talitos - Fix timing leak in ESP ICV verification

2016-01-05T11:22:18+00:00

commit 79960943fdc114fd4583c9ab164b5c89da7aa601 upstream.

Using non-constant time memcmp() makes the verification of the authentication
tag in the decrypt path vulnerable to timing attacks. Fix this by using
crypto_memneq() instead.

Signed-off-by: David Gstir 
Signed-off-by: Herbert Xu 
[ luis: backported to 3.16: adjusted context ]
Signed-off-by: Luis Henriques

crypto: nx - Fix timing leak in GCM and CCM decryption

2016-01-05T11:22:18+00:00

commit cb8affb55c7e64816f3effcd9b2fc3268c016fac upstream.

Using non-constant time memcmp() makes the verification of the authentication
tag in the decrypt path vulnerable to timing attacks. Fix this by using
crypto_memneq() instead.

Signed-off-by: David Gstir 
Signed-off-by: Herbert Xu 
[ luis: backported to 3.16: adjusted context ]
Signed-off-by: Luis Henriques

crypto: caam - fix memory corruption in ahash_final_ctx

2015-09-03T12:29:51+00:00

commit b310c178e6d897f82abb9da3af1cd7c02b09f592 upstream.

When doing pointer operation for accessing the HW S/G table,
a value representing number of entries (and not number of bytes)
must be used.

Fixes: 045e36780f115 ("crypto: caam - ahash hmac support")
Signed-off-by: Horia Geant? 
Signed-off-by: Herbert Xu 
Signed-off-by: Luis Henriques

crypto: ixp4xx - Remove bogus BUG_ON on scattered dst buffer

2015-08-27T11:08:06+00:00

commit f898c522f0e9ac9f3177d0762b76e2ab2d2cf9c0 upstream.

This patch removes a bogus BUG_ON in the ablkcipher path that
triggers when the destination buffer is different from the source
buffer and is scattered.

Signed-off-by: Herbert Xu 
Signed-off-by: Luis Henriques

crypto: omap-des - Fix unmapping of dma channels

2015-08-10T08:54:10+00:00

commit acb33cc541d7a5495b16a133702d4c401ea4e294 upstream.

dma_unmap_sg() is being called twice after completing the
task. Looks like this is a copy paste error when creating
des driver.
With this the following warn appears during boot:

[    4.210457] ------------[ cut here ]------------
[    4.215114] WARNING: CPU: 0 PID: 0 at lib/dma-debug.c:1080 check_unmap+0x710/0x9a0()
[    4.222899] omap-des 480a5000.des: DMA-API: device driver tries to free DMA memory it has not allocated [device address=0x00000000ab2ce000] [size=8 bytes]
[    4.236785] Modules linked in:
[    4.239860] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.14.39-02999-g1bc045a-dirty #182
[    4.247918] [] (unwind_backtrace) from [] (show_stack+0x10/0x14)
[    4.255710] [] (show_stack) from [] (dump_stack+0x84/0xb8)
[    4.262977] [] (dump_stack) from [] (warn_slowpath_common+0x68/0x8c)
[    4.271107] [] (warn_slowpath_common) from [] (warn_slowpath_fmt+0x30/0x40)
[    4.279854] [] (warn_slowpath_fmt) from [] (check_unmap+0x710/0x9a0)
[    4.287991] [] (check_unmap) from [] (debug_dma_unmap_sg+0x90/0x19c)
[    4.296128] [] (debug_dma_unmap_sg) from [] (omap_des_done_task+0x1cc/0x3e4)
[    4.304963] [] (omap_des_done_task) from [] (tasklet_action+0x84/0x124)
[    4.313370] [] (tasklet_action) from [] (__do_softirq+0xf0/0x20c)
[    4.321235] [] (__do_softirq) from [] (irq_exit+0x98/0xec)
[    4.328500] [] (irq_exit) from [] (handle_IRQ+0x50/0xb0)
[    4.335589] [] (handle_IRQ) from [] (gic_handle_irq+0x28/0x5c)

Removing the duplicate call to dma_unmap_sg().

Reported-by: Tomi Valkeinen 
Signed-off-by: Lokesh Vutla 
Signed-off-by: Herbert Xu 
Signed-off-by: Luis Henriques

Revert "crypto: talitos - convert to use be16_add_cpu()"

2015-07-09T13:36:02+00:00

commit 69d9cd8c592f1abce820dbce7181bbbf6812cfbd upstream.

This reverts commit 7291a932c6e27d9768e374e9d648086636daf61c.

The conversion to be16_add_cpu() is incorrect in case cryptlen is
negative due to premature (i.e. before addition / subtraction)
implicit conversion of cryptlen (int -> u16) leading to sign loss.

Cc: Wei Yongjun 
Signed-off-by: Horia Geanta 
Signed-off-by: Herbert Xu 
Signed-off-by: Luis Henriques