linux-stable.git/drivers/crypto/ccree, branch linux-5.15.y

crypto: ccree - Correctly handle return of sg_nents_for_len

2026-01-19T12:09:32+00:00

[ Upstream commit 8700ce07c5c6bf27afa7b59a8d9cf58d783a7d5c ]

Fix error handling in cc_map_hash_request_update where sg_nents_for_len
return value was assigned to u32, converting negative errors to large
positive values before passing to sg_copy_to_buffer.

Check sg_nents_for_len return value and propagate errors before
assigning to areq_ctx->in_nents.

Fixes: b7ec8530687a ("crypto: ccree - use std api when possible")
Signed-off-by: Haotian Zhang 
Signed-off-by: Herbert Xu 
Signed-off-by: Sasha Levin

crypto: ccree - Make cc_debugfs_global_fini() available for module init function

2022-12-31T12:14:24+00:00

[ Upstream commit 8e96729fc26c8967db45a3fb7a60387619f77a22 ]

ccree_init() calls cc_debugfs_global_fini(), the former is an init
function and the latter an exit function though.

A modular build emits:

	WARNING: modpost: drivers/crypto/ccree/ccree.o: section mismatch in reference: init_module (section: .init.text) -> cc_debugfs_global_fini (section: .exit.text)

(with CONFIG_DEBUG_SECTION_MISMATCH=y).

Fixes: 4f1c596df706 ("crypto: ccree - Remove debugfs when platform_driver_register failed")
Signed-off-by: Uwe Kleine-König 
Signed-off-by: Herbert Xu 
Signed-off-by: Sasha Levin

crypto: ccree - Remove debugfs when platform_driver_register failed

2022-12-31T12:14:23+00:00

[ Upstream commit 4f1c596df706c9aca662b6c214fad84047ae2a97 ]

When platform_driver_register failed, we need to remove debugfs,
which will caused a resource leak, fix it.

Failed logs as follows:
[   32.606488] debugfs: Directory 'ccree' with parent '/' already present!

Fixes: 4c3f97276e15 ("crypto: ccree - introduce CryptoCell driver")
Signed-off-by: Gaosheng Cui 
Signed-off-by: Herbert Xu 
Signed-off-by: Sasha Levin

crypto: ccree - use fine grained DMA mapping dir

2022-06-09T08:22:41+00:00

[ Upstream commit a260436c98171cd825955a84a7f6e62bc8f4f00d ]

Use a fine grained specification of DMA mapping directions
in certain cases, allowing both a more optimized operation
as well as shushing out a harmless, though persky
dma-debug warning.

Signed-off-by: Gilad Ben-Yossef 
Reported-by: Corentin Labbe 
Signed-off-by: Herbert Xu 
Signed-off-by: Sasha Levin

crypto: ccree - Fix use after free in cc_cipher_exit()

2022-04-08T12:23:09+00:00

[ Upstream commit 3d950c34074ed74d2713c3856ba01264523289e6 ]

kfree_sensitive(ctx_p->user.key) will free the ctx_p->user.key. But
ctx_p->user.key is still used in the next line, which will lead to a
use after free.

We can call kfree_sensitive() after dev_dbg() to avoid the uaf.

Fixes: 63ee04c8b491 ("crypto: ccree - add skcipher support")
Signed-off-by: Jianglei Nie 
Signed-off-by: Herbert Xu 
Signed-off-by: Sasha Levin

crypto: ccree - don't attempt 0 len DMA mappings

2022-04-08T12:23:06+00:00

[ Upstream commit 1fb37b5692c915edcc2448a6b37255738c7c77e0 ]

Refuse to try mapping zero bytes as this may cause a fault
on some configurations / platforms and it seems the prev.
attempt is not enough and we need to be more explicit.

Signed-off-by: Gilad Ben-Yossef 
Reported-by: Corentin Labbe 
Fixes: ce0fc6db38de ("crypto: ccree - protect against empty or NULL
scatterlists")
Tested-by: Corentin Labbe 
Signed-off-by: Herbert Xu 
Signed-off-by: Sasha Levin

crypto: ccree - avoid out-of-range warnings from clang

2021-11-18T18:16:30+00:00

[ Upstream commit cfd6fb45cfaf46fa9547421d8da387dc9c7997d4 ]

clang points out inconsistencies in the FIELD_PREP() invocation in
this driver that result from the 'mask' being a 32-bit value:

drivers/crypto/ccree/cc_driver.c:117:18: error: result of comparison of constant 18446744073709551615 with expression of type 'u32' (aka 'unsigned int') is always false [-Werror,-Wtautological-constant-out-of-range-compare]
        cache_params |= FIELD_PREP(mask, val);
                        ^~~~~~~~~~~~~~~~~~~~~
include/linux/bitfield.h:94:3: note: expanded from macro 'FIELD_PREP'
                __BF_FIELD_CHECK(_mask, 0ULL, _val, "FIELD_PREP: ");    \
                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/bitfield.h:52:28: note: expanded from macro '__BF_FIELD_CHECK'
                BUILD_BUG_ON_MSG((_mask) > (typeof(_reg))~0ull,         \
                ~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

This does not happen in other places that just pass a constant here.

Work around the warnings by widening the type of the temporary variable.

Fixes: 05c2a705917b ("crypto: ccree - rework cache parameters handling")
Signed-off-by: Arnd Bergmann 
Acked-by: Gilad ben-Yossef 
Signed-off-by: Herbert Xu 
Signed-off-by: Sasha Levin

crypto: ccree - Remove redundant dev_err call in init_cc_resources()

2021-04-16T11:16:32+00:00

There is a error message within devm_ioremap_resource
already, so remove the dev_err call to avoid redundant
error message.

Signed-off-by: YueHaibing 
Signed-off-by: Herbert Xu

crypto: ccree - fix spelling typo of allocated

2021-02-05T03:31:35+00:00

allocted -> allocated

Signed-off-by: dingsenjie 
Signed-off-by: Herbert Xu

crypto: ccree - remove unused including

2021-01-02T21:41:35+00:00

Remove including  that don't need it.

Signed-off-by: Tian Tao 
Signed-off-by: Herbert Xu