| Message ID | 20160127171401.32579.42285.stgit@tstruk-mobl1 (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Herbert Xu |
| Headers | show |
On Wed, Jan 27, 2016 at 09:14:01AM -0800, Tadeusz Struk wrote: > Before the skcipher conversion the async callback used the > crypto_async_request directly as the ablkcipher_request. > It wasn't quite correct, but it worked fine since the > crypto_async_request *base was the first member of the ablkcipher_request > struct. After the skcipher conversion it is not the case anymore and > a proper cast helper needs to be used. > > Cc: <stable@vger.kernel.org> # 4.4.x- > Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com> > --- > crypto/algif_skcipher.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c > index 38c1aa8..78529ce 100644 > --- a/crypto/algif_skcipher.c > +++ b/crypto/algif_skcipher.c > @@ -100,11 +100,12 @@ static void skcipher_free_async_sgls(struct skcipher_async_req *sreq) > kfree(sreq->tsg); > } > > -static void skcipher_async_cb(struct crypto_async_request *req, int err) > +static void skcipher_async_cb(struct crypto_async_request *_req, int err) Please call it req_base or something similar. Thanks,
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index 38c1aa8..78529ce 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -100,11 +100,12 @@ static void skcipher_free_async_sgls(struct skcipher_async_req *sreq) kfree(sreq->tsg); } -static void skcipher_async_cb(struct crypto_async_request *req, int err) +static void skcipher_async_cb(struct crypto_async_request *_req, int err) { - struct sock *sk = req->data; + struct sock *sk = _req->data; struct alg_sock *ask = alg_sk(sk); struct skcipher_ctx *ctx = ask->private; + struct skcipher_request *req = skcipher_request_cast(_req); struct skcipher_async_req *sreq = GET_SREQ(req, ctx); struct kiocb *iocb = sreq->iocb;
Before the skcipher conversion the async callback used the crypto_async_request directly as the ablkcipher_request. It wasn't quite correct, but it worked fine since the crypto_async_request *base was the first member of the ablkcipher_request struct. After the skcipher conversion it is not the case anymore and a proper cast helper needs to be used. Cc: <stable@vger.kernel.org> # 4.4.x- Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com> --- crypto/algif_skcipher.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html