crypto: echainiv - Copy AD along with plain text

As the AD does not necessarily exist in the destination buffer
it must be copied along with the plain text.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/echainiv.c b/crypto/echainiv.c
index bd85dcc4fa3d07c7de79abaf950008fa351ff0b5..02d054300a9ab84ae36e0b3c8906a9a53db41dca 100644 (file)
--- a/crypto/echainiv.c
+++ b/crypto/echainiv.c
@@ -228,19 +228,13 @@ static int echainiv_encrypt(struct aead_request *req)
        info = req->iv;
 
        if (req->src != req->dst) {
-               struct scatterlist src[2];
-               struct scatterlist dst[2];
                struct blkcipher_desc desc = {
                        .tfm = ctx->null,
                };
 
                err = crypto_blkcipher_encrypt(
-                       &desc,
-                       scatterwalk_ffwd(dst, req->dst,
-                                        req->assoclen + ivsize),
-                       scatterwalk_ffwd(src, req->src,
-                                        req->assoclen + ivsize),
-                       req->cryptlen - ivsize);
+                       &desc, req->dst, req->src,
+                       req->assoclen + req->cryptlen);
                if (err)
                        return err;
        }