Re: [PATCH 1/3] crypto: skcipher - return the correct request to the user
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: 2016-01-28 04:53:42
Also in:
stable
On Wed, Jan 27, 2016 at 09:13:56AM -0800, Tadeusz Struk wrote:
quoted hunk ↗ jump to hunk
diff --git a/crypto/skcipher.c b/crypto/skcipher.c index 69230e9..a9d54c0 100644 --- a/crypto/skcipher.c +++ b/crypto/skcipher.c@@ -142,6 +142,15 @@ static int skcipher_setkey_ablkcipher(struct crypto_skcipher *tfm, return err; } +static void skcipher_complete(struct crypto_async_request *req_base, int err) +{ + void *subreq = ablkcipher_request_cast(req_base); + struct skcipher_request *req = + container_of(subreq, struct skcipher_request, __ctx); + + req->base.complete(&req->base, err); +} + static int skcipher_crypt_ablkcipher(struct skcipher_request *req, int (*crypt)(struct ablkcipher_request *)) {@@ -151,7 +160,7 @@ static int skcipher_crypt_ablkcipher(struct skcipher_request *req, ablkcipher_request_set_tfm(subreq, *ctx); ablkcipher_request_set_callback(subreq, skcipher_request_flags(req), - req->base.complete, req->base.data); + skcipher_complete, req->base.data); ablkcipher_request_set_crypt(subreq, req->src, req->dst, req->cryptlen, req->iv);
Rather than playing with lots of casts, just set the ablkcipher callback data to req and be done with it. Thanks, -- Email: Herbert Xu [off-list ref] Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt