From: David S. Miller <davem@davemloft.net>
Date: Thu, 12 Feb 2015 03:47:00 +0000 (-0800)
Subject: Revert "crypto: Fix regressions caused by iov_iter changes."
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e09dcd2e7913aa50b5cb4836bc1e990e429e4aff;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

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>
---

diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index 5b11d645343d..eb78fe8a60c8 100644
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -348,7 +348,7 @@ int af_alg_make_sg(struct af_alg_sgl *sgl, struct iov_iter *iter, int len)
 	if (n < 0)
 		return n;
 
-	npages = DIV_ROUND_UP(off + n, PAGE_SIZE);
+	npages = PAGE_ALIGN(off + n);
 	if (WARN_ON(npages == 0))
 		return -EINVAL;
 
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index 0eb31a69a0a6..37110fd68adf 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -427,11 +427,11 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock,
 	struct skcipher_sg_list *sgl;
 	struct scatterlist *sg;
 	int err = -EAGAIN;
+	int used;
 	long copied = 0;
 
 	lock_sock(sk);
 	while (iov_iter_count(&msg->msg_iter)) {
-		int used;
 		sgl = list_first_entry(&ctx->tsgl,
 				       struct skcipher_sg_list, list);
 		sg = sgl->sg;
@@ -439,13 +439,14 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock,
 		while (!sg->length)
 			sg++;
 
-		if (!ctx->used) {
+		used = ctx->used;
+		if (!used) {
 			err = skcipher_wait_for_data(sk, flags);
 			if (err)
 				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);
 		err = used;