]> git.baikalelectronics.ru Git - kernel.git/commitdiff
crypto: atmel-aes - fix atmel_aes_handle_queue()
authorCyrille Pitchen <cyrille.pitchen@atmel.com>
Thu, 26 Jan 2017 16:07:55 +0000 (17:07 +0100)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 3 Feb 2017 10:16:14 +0000 (18:16 +0800)
This patch fixes the value returned by atmel_aes_handle_queue(), which
could have been wrong previously when the crypto request was started
synchronously but became asynchronous during the ctx->start() call.

Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/atmel-aes.c

index 0e3d0d655b9679a113d7934f6566532968a15522..9fd2f63b8bc08cb47f90aed07e670965d38e83d2 100644 (file)
@@ -879,6 +879,7 @@ static int atmel_aes_handle_queue(struct atmel_aes_dev *dd,
        struct crypto_async_request *areq, *backlog;
        struct atmel_aes_base_ctx *ctx;
        unsigned long flags;
+       bool start_async;
        int err, ret = 0;
 
        spin_lock_irqsave(&dd->lock, flags);
@@ -904,10 +905,12 @@ static int atmel_aes_handle_queue(struct atmel_aes_dev *dd,
 
        dd->areq = areq;
        dd->ctx = ctx;
-       dd->is_async = (areq != new_areq);
+       start_async = (areq != new_areq);
+       dd->is_async = start_async;
 
+       /* WARNING: ctx->start() MAY change dd->is_async. */
        err = ctx->start(dd);
-       return (dd->is_async) ? ret : err;
+       return (start_async) ? ret : err;
 }