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

crypto: ccp - memset request context to zero during import

2016-04-18T12:49:19+00:00

[ Upstream commit ce0ae266feaf35930394bd770c69778e4ef03ba9 ]

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().

Cc:  # 3.14.x-
Signed-off-by: Tom Lendacky 
Signed-off-by: Herbert Xu 
Signed-off-by: Sasha Levin

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

2016-04-12T13:10:24+00:00

[ Upstream commit b31dde2a5cb1bf764282abf934266b7193c2bc7c ]

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.

Cc:  # 3.14.x-
Signed-off-by: Tom Lendacky 
Signed-off-by: Herbert Xu 
Signed-off-by: Sasha Levin

crypto: ccp - Limit the amount of information exported

2016-04-12T13:10:19+00:00

[ Upstream commit d1662165ae612ec8b5f94a6b07e65ea58b6dce34 ]

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

Cc:  # 3.14.x-
Signed-off-by: Tom Lendacky 
Signed-off-by: Herbert Xu 
Signed-off-by: Sasha Levin

crypto: ccp - Add hash state import and export support

2016-04-12T13:09:56+00:00

[ Upstream commit 952bce9792e6bf36fda09c2e5718abb5d9327369 ]

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.

Cc:  # 3.14.x-
Signed-off-by: Tom Lendacky 
Signed-off-by: Herbert Xu 
Signed-off-by: Sasha Levin

crypto: caam - fix memory corruption in ahash_final_ctx

2015-09-17T05:31:22+00:00

[ Upstream commit b310c178e6d897f82abb9da3af1cd7c02b09f592 ]

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.

Cc:  # 3.6+
Fixes: 045e36780f115 ("crypto: caam - ahash hmac support")
Signed-off-by: Horia Geant? 
Signed-off-by: Herbert Xu 
Signed-off-by: Sasha Levin

crypto: ixp4xx - Remove bogus BUG_ON on scattered dst buffer

2015-08-27T17:25:27+00:00

[ Upstream commit f898c522f0e9ac9f3177d0762b76e2ab2d2cf9c0 ]

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.

Cc: stable@vger.kernel.org
Signed-off-by: Herbert Xu 
Signed-off-by: Sasha Levin

crypto: qat - Fix invalid synchronization between register/unregister sym algs

2015-08-27T17:25:26+00:00

[ Upstream commit 7047312d383203f7b8447261f1a473cf54aedec3 ]

commit 6f043b50da8e03bdcc5703fd37ea45bc6892432f upstream.

The synchronization method used atomic was bogus.
Use a proper synchronization with mutex.

Signed-off-by: Tadeusz Struk 
Signed-off-by: Herbert Xu 
Signed-off-by: Greg Kroah-Hartman 
Signed-off-by: Sasha Levin

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

2015-07-04T03:02:16+00:00

[ Upstream commit 69d9cd8c592f1abce820dbce7181bbbf6812cfbd ]

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:  # 3.10+
Cc: Wei Yongjun 
Signed-off-by: Horia Geanta 
Signed-off-by: Herbert Xu 
Signed-off-by: Sasha Levin

crypto: talitos - avoid memleak in talitos_alg_alloc()

2015-07-04T03:02:15+00:00

[ Upstream commit 5fa7dadc898567ce14d6d6d427e7bd8ce6eb5d39 ]

Cc:  # 3.2+
Fixes: 1d11911a8c57 ("crypto: talitos - fix warning: 'alg' may be used uninitialized in this function")
Signed-off-by: Horia Geanta 
Signed-off-by: Herbert Xu 
Signed-off-by: Sasha Levin

crypto: caam - fix RNG buffer cache alignment

2015-07-01T19:34:44+00:00

[ Upstream commit 412c98c1bef65fe7589f1300e93735d96130307c ]

The hwrng output buffers (2) are cast inside of a a struct (caam_rng_ctx)
allocated in one DMA-tagged region. While the kernel's heap allocator
should place the overall struct on a cacheline aligned boundary, the 2
buffers contained within may not necessarily align. Consenquently, the ends
of unaligned buffers may not fully flush, and if so, stale data will be left
behind, resulting in small repeating patterns.

This fix aligns the buffers inside the struct.

Note that not all of the data inside caam_rng_ctx necessarily needs to be
DMA-tagged, only the buffers themselves require this. However, a fix would
incur the expense of error-handling bloat in the case of allocation failure.

Cc: stable@vger.kernel.org
Signed-off-by: Steve Cornelius 
Signed-off-by: Victoria Milhoan 
Signed-off-by: Herbert Xu 
Signed-off-by: Sasha Levin