diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-21 17:16:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-21 17:16:49 -0700 |
| commit | e51a3630565f61a5151f24f9ece191277ddaa320 (patch) | |
| tree | b66b46a021aeab28e41197620ea7e42481431b99 /crypto | |
| parent | 3d854120e97b87c04f3a4b0e272d61acedb144c7 (diff) | |
| parent | 7b2a18e05feb86f9be25602abfa9604a6b977f79 (diff) | |
| download | op-kernel-dev-e51a3630565f61a5151f24f9ece191277ddaa320.zip op-kernel-dev-e51a3630565f61a5151f24f9ece191277ddaa320.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu:
"This fixes a the crash in the newly added algif_aead interface when it
tries to link SG lists"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: algif_aead - fix invalid sgl linking
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/algif_aead.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c index 00a6fe1..69abada 100644 --- a/crypto/algif_aead.c +++ b/crypto/algif_aead.c @@ -33,7 +33,7 @@ struct aead_ctx { /* * RSGL_MAX_ENTRIES is an artificial limit where user space at maximum * can cause the kernel to allocate RSGL_MAX_ENTRIES * ALG_MAX_PAGES - * bytes + * pages */ #define RSGL_MAX_ENTRIES ALG_MAX_PAGES 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) goto unlock; usedpages += err; - /* chain the new scatterlist with initial list */ + /* chain the new scatterlist with previous one */ if (cnt) - scatterwalk_crypto_chain(ctx->rsgl[0].sg, - ctx->rsgl[cnt].sg, 1, - sg_nents(ctx->rsgl[cnt-1].sg)); + af_alg_link_sg(&ctx->rsgl[cnt-1], &ctx->rsgl[cnt]); + /* we do not need more iovecs as we have sufficient memory */ if (outlen <= usedpages) break; |
