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

crypto: ccree - dec auth tag size from cryptlen map

2020-04-17T14:13:40+00:00

commit 8962c6d2c2b8ca51b0f188109015b15fc5f4da44 upstream.

Remove the auth tag size from cryptlen before mapping the destination
in out-of-place AEAD decryption thus resolving a crash with
extended testmgr tests.

Signed-off-by: Gilad Ben-Yossef 
Reported-by: Geert Uytterhoeven 
Cc: stable@vger.kernel.org # v4.19+
Tested-by: Geert Uytterhoeven 
Signed-off-by: Herbert Xu 
Signed-off-by: Greg Kroah-Hartman

crypto: ccree - only try to map auth tag if needed

2020-04-17T14:13:40+00:00

commit 504e84abec7a635b861afd8d7f92ecd13eaa2b09 upstream.

Make sure to only add the size of the auth tag to the source mapping
for encryption if it is an in-place operation. Failing to do this
previously caused us to try and map auth size len bytes from a NULL
mapping and crashing if both the cryptlen and assoclen are zero.

Reported-by: Geert Uytterhoeven 
Tested-by: Geert Uytterhoeven 
Signed-off-by: Gilad Ben-Yossef 
Cc: stable@vger.kernel.org # v4.19+
Signed-off-by: Herbert Xu 
Signed-off-by: Greg Kroah-Hartman

crypto: ccree - protect against empty or NULL scatterlists

2020-04-17T14:13:39+00:00

commit ce0fc6db38decf0d2919bfe783de6d6b76e421a9 upstream.

Deal gracefully with a NULL or empty scatterlist which can happen
if both cryptlen and assoclen are zero and we're doing in-place
AEAD encryption.

This fixes a crash when this causes us to try and map a NULL page,
at least with some platforms / DMA mapping configs.

Cc: stable@vger.kernel.org # v4.19+
Reported-by: Geert Uytterhoeven 
Tested-by: Geert Uytterhoeven 
Signed-off-by: Gilad Ben-Yossef 
Signed-off-by: Herbert Xu 
Signed-off-by: Greg Kroah-Hartman

crypto: ccree - erase unneeded inline funcs

2020-01-22T08:21:11+00:00

These inline versions of PM function for the case of CONFIG_PM is
not set are never used. Erase them.

Signed-off-by: Gilad Ben-Yossef 
Signed-off-by: Herbert Xu

crypto: ccree - make cc_pm_put_suspend() void

2020-01-22T08:21:10+00:00

cc_pm_put_suspend() return value was never checked and is not
useful. Turn it into a void functions.

Signed-off-by: Gilad Ben-Yossef 
Signed-off-by: Herbert Xu

crypto: ccree - split overloaded usage of irq field

2020-01-22T08:21:10+00:00

We were using the irq field of the drvdata struct in
an overloaded fahsion - saving the IRQ number during init
and then storing the pending itnerrupt sources during
interrupt in the same field.

This worked because these usage are mutually exclusive but
are confusing. So simplify the code and change the init use
case to use a simple local variable.

Signed-off-by: Gilad Ben-Yossef 
Signed-off-by: Herbert Xu

crypto: ccree - fix PM race condition

2020-01-22T08:21:10+00:00

The PM code was racy, possibly causing the driver to submit
requests to a powered down device. Fix the race and while
at it simplify the PM code.

Signed-off-by: Gilad Ben-Yossef 
Fixes: 1358c13a48c4 ("crypto: ccree - fix resume race condition on init")
Cc: stable@kernel.org # v4.20
Signed-off-by: Herbert Xu

crypto: ccree - fix FDE descriptor sequence

2020-01-22T08:21:10+00:00

In FDE mode (xts, essiv and bitlocker) the cryptocell hardware requires
that the the XEX key will be loaded after Key1.

Signed-off-by: Ofir Drang 
Cc: stable@vger.kernel.org
Signed-off-by: Herbert Xu

crypto: ccree - cc_do_send_request() is void func

2020-01-22T08:21:10+00:00

cc_do_send_request() cannot fail and always returns
-EINPROGRESS. Turn it into a void function and simplify
code.

Signed-off-by: Gilad Ben-Yossef 
Signed-off-by: Herbert Xu

crypto: ccree - fix pm wrongful error reporting

2020-01-22T08:21:10+00:00

pm_runtime_get_sync() can return 1 as a valid (none error) return
code. Treat it as such.

Signed-off-by: Gilad Ben-Yossef 
Cc: stable@vger.kernel.org # v4.19+
Signed-off-by: Herbert Xu