crypto: caam - fix signals handling
commit7459e1d25f
upstream. Driver does not properly handle the case when signals interrupt wait_for_completion_interruptible(): -it does not check for return value -completion structure is allocated on stack; in case a signal interrupts the sleep, it will go out of scope, causing the worker thread (caam_jr_dequeue) to fail when it accesses it wait_for_completion_interruptible() is replaced with uninterruptable wait_for_completion(). We choose to block all signals while waiting for I/O (device executing the split key generation job descriptor) since the alternative - in order to have a deterministic device state - would be to flush the job ring (aborting *all* in-progress jobs). Fixes:045e36780f
("crypto: caam - ahash hmac support") Fixes:4c1ec1f930
("crypto: caam - refactor key_gen, sg") Signed-off-by: Horia Geantă <horia.geanta@nxp.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
48a9dff213
commit
80495c7084
|
@ -491,7 +491,7 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, const u8 *key_in,
|
||||||
ret = caam_jr_enqueue(jrdev, desc, split_key_done, &result);
|
ret = caam_jr_enqueue(jrdev, desc, split_key_done, &result);
|
||||||
if (!ret) {
|
if (!ret) {
|
||||||
/* in progress */
|
/* in progress */
|
||||||
wait_for_completion_interruptible(&result.completion);
|
wait_for_completion(&result.completion);
|
||||||
ret = result.err;
|
ret = result.err;
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
print_hex_dump(KERN_ERR,
|
print_hex_dump(KERN_ERR,
|
||||||
|
|
|
@ -103,7 +103,7 @@ int gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len,
|
||||||
ret = caam_jr_enqueue(jrdev, desc, split_key_done, &result);
|
ret = caam_jr_enqueue(jrdev, desc, split_key_done, &result);
|
||||||
if (!ret) {
|
if (!ret) {
|
||||||
/* in progress */
|
/* in progress */
|
||||||
wait_for_completion_interruptible(&result.completion);
|
wait_for_completion(&result.completion);
|
||||||
ret = result.err;
|
ret = result.err;
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
print_hex_dump(KERN_ERR, "ctx.key@"__stringify(__LINE__)": ",
|
print_hex_dump(KERN_ERR, "ctx.key@"__stringify(__LINE__)": ",
|
||||||
|
|
Loading…
Reference in a new issue