a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crypto: algif_aead - fix invalid sgl linking

Browse Source 
This patch fixes it.
Also minor updates to comments.

Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Tadeusz Struk 2015-05-15 10:18:37 -07:00 committed by Herbert Xu
parent ec59a65d69
commit 7b2a18e05f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/algif_aead.c
View File

@ -33,7 +33,7 @@ struct aead_ctx {
/* /*
* RSGL_MAX_ENTRIES is an artificial limit where user space at maximum * RSGL_MAX_ENTRIES is an artificial limit where user space at maximum
* can cause the kernel to allocate RSGL_MAX_ENTRIES * ALG_MAX_PAGES * can cause the kernel to allocate RSGL_MAX_ENTRIES * ALG_MAX_PAGES
* bytes * pages
*/ */
#define RSGL_MAX_ENTRIES ALG_MAX_PAGES #define RSGL_MAX_ENTRIES ALG_MAX_PAGES
struct af_alg_sgl rsgl[RSGL_MAX_ENTRIES]; struct af_alg_sgl rsgl[RSGL_MAX_ENTRIES];
@ -435,11 +435,10 @@ static int aead_recvmsg(struct socket *sock, struct msghdr *msg, size_t ignored,
if (err < 0) if (err < 0)
goto unlock; goto unlock;
usedpages += err; usedpages += err;
/* chain the new scatterlist with initial list */ /* chain the new scatterlist with previous one */
if (cnt) if (cnt)
scatterwalk_crypto_chain(ctx->rsgl[0].sg, af_alg_link_sg(&ctx->rsgl[cnt-1], &ctx->rsgl[cnt]);
ctx->rsgl[cnt].sg, 1,
sg_nents(ctx->rsgl[cnt-1].sg));
/* we do not need more iovecs as we have sufficient memory */ /* we do not need more iovecs as we have sufficient memory */
if (outlen <= usedpages) if (outlen <= usedpages)
break; break;