crypto: algif_hash - wait for crypto_ahash_init() to complete
authorWang, Rui Y <rui.y.wang@intel.com>
Wed, 27 Jan 2016 09:08:37 +0000 (17:08 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Sat, 30 Jan 2016 14:05:15 +0000 (22:05 +0800)
hash_sendmsg/sendpage() need to wait for the completion
of crypto_ahash_init() otherwise it can cause panic.

Cc: stable@vger.kernel.org
Signed-off-by: Rui Wang <rui.y.wang@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
crypto/algif_hash.c

index 608a7562839d2fe549fbebd8714733436ed2c481..68a5ceaa04c81072f453a7b2ca2605bed39bd5a1 100644 (file)
@@ -54,7 +54,8 @@ static int hash_sendmsg(struct socket *sock, struct msghdr *msg,
 
        lock_sock(sk);
        if (!ctx->more) {
-               err = crypto_ahash_init(&ctx->req);
+               err = af_alg_wait_for_completion(crypto_ahash_init(&ctx->req),
+                                               &ctx->completion);
                if (err)
                        goto unlock;
        }
@@ -125,6 +126,7 @@ static ssize_t hash_sendpage(struct socket *sock, struct page *page,
        } else {
                if (!ctx->more) {
                        err = crypto_ahash_init(&ctx->req);
+                       err = af_alg_wait_for_completion(err, &ctx->completion);
                        if (err)
                                goto unlock;
                }