linux-stable.git/drivers/crypto/ccp, branch linux-4.1.y

crypto: ccp - Fix AES XTS error for request sizes above 4096

2016-06-17T13:09:32+00:00

[ Upstream commit ab6a11a7c8ef47f996974dd3c648c2c0b1a36ab1 ]

The ccp-crypto module for AES XTS support has a bug that can allow requests
greater than 4096 bytes in size to be passed to the CCP hardware. The CCP
hardware does not support request sizes larger than 4096, resulting in
incorrect output. The request should actually be handled by the fallback
mechanism instantiated by the ccp-crypto module.

Add a check to insure the request size is less than or equal to the maximum
supported size and use the fallback mechanism if it is not.

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

crypto: ccp - Prevent information leakage on export

2016-05-08T12:09:02+00:00

[ Upstream commit f709b45ec461b548c41a00044dba1f1b572783bf ]

Prevent information from leaking to userspace by doing a memset to 0 of
the export state structure before setting the structure values and copying
it. This prevents un-initialized padding areas from being copied into the
export area.

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

crypto: ccp - memset request context to zero during import

2016-04-18T12:50:41+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-18T12:50:34+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-18T12:50:34+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-18T12:50:32+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: ccp - Add ACPI support

2015-02-27T09:48:49+00:00

Add support for ACPI to the CCP platform driver.

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

crypto: ccp - Convert calls to their devm_ counterparts

2015-02-27T09:48:48+00:00

Where applicable, convert calls to their devm_ counterparts, e.g. kzalloc
to devm_kzalloc.

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

crypto: ccp - Use dma_set_mask_and_coherent to set DMA mask

2015-02-27T09:48:48+00:00

Replace the setting of the DMA masks with the dma_set_mask_and_coherent
function call.

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

crypto: ccp - Update CCP build support

2015-02-27T09:48:48+00:00

Add HAS_IOMEM as a Kconfig dependency. Always include ccp-platform.c
in the CCP build and conditionally include ccp-pci.c.

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