android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "crypto: Fix regressions caused by iov_iter changes."

Browse Source 
This reverts commit 750d8065d88bc72bd6e1fd9f896a964c35dda818.

Linus already fixed this in his tree so just use what
he did.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2015-02-11 19:47:00 -08:00
parent 750d8065d8
commit e09dcd2e79
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/af_alg.c
View File

@ -348,7 +348,7 @@ int af_alg_make_sg(struct af_alg_sgl *sgl, struct iov_iter *iter, int len)
if (n < 0) if (n < 0)
return n; return n;
npages = DIV_ROUND_UP(off + n, PAGE_SIZE); npages = PAGE_ALIGN(off + n);
if (WARN_ON(npages == 0)) if (WARN_ON(npages == 0))
return -EINVAL; return -EINVAL;

7
crypto/algif_skcipher.c
View File

@ -427,11 +427,11 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock,
struct skcipher_sg_list *sgl; struct skcipher_sg_list *sgl;
struct scatterlist *sg; struct scatterlist *sg;
int err = -EAGAIN; int err = -EAGAIN;
int used;
long copied = 0; long copied = 0;
lock_sock(sk); lock_sock(sk);
while (iov_iter_count(&msg->msg_iter)) { while (iov_iter_count(&msg->msg_iter)) {
int used;
sgl = list_first_entry(&ctx->tsgl, sgl = list_first_entry(&ctx->tsgl,
struct skcipher_sg_list, list); struct skcipher_sg_list, list);
sg = sgl->sg; sg = sgl->sg;
@ -439,13 +439,14 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock,
while (!sg->length) while (!sg->length)
sg++; sg++;
if (!ctx->used) { used = ctx->used;
if (!used) {
err = skcipher_wait_for_data(sk, flags); err = skcipher_wait_for_data(sk, flags);
if (err) if (err)
goto unlock; goto unlock;
} }
used = min_t(unsigned long, ctx->used, iov_iter_count(&msg->msg_iter)); used = min_t(unsigned long, used, iov_iter_count(&msg->msg_iter));
used = af_alg_make_sg(&ctx->rsgl, &msg->msg_iter, used); used = af_alg_make_sg(&ctx->rsgl, &msg->msg_iter, used);
err = used; err = used;