Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

More iov_iter work from Al Viro.

Signed-off-by: David S. Miller <davem@davemloft.net>

33 files changed, 320 insertions, 686 deletions

diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index 4665b79c729a..eb78fe8a60c8 100644
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -338,49 +338,31 @@ static const struct net_proto_family alg_family = {
         .owner  =       THIS_MODULE,
 };
 
-int af_alg_make_sg(struct af_alg_sgl *sgl, void __user *addr, int len,
-                   int write)
+int af_alg_make_sg(struct af_alg_sgl *sgl, struct iov_iter *iter, int len)
 {
-        unsigned long from = (unsigned long)addr;
-        unsigned long npages;
-        unsigned off;
-        int err;
-        int i;
-
-        err = -EFAULT;
-        if (!access_ok(write ? VERIFY_READ : VERIFY_WRITE, addr, len))
-                goto out;
-
-        off = from & ~PAGE_MASK;
-        npages = (off + len + PAGE_SIZE - 1) >> PAGE_SHIFT;
-        if (npages > ALG_MAX_PAGES)
-                npages = ALG_MAX_PAGES;
+        size_t off;
+        ssize_t n;
+        int npages, i;
 
-        err = get_user_pages_fast(from, npages, write, sgl->pages);
-        if (err < 0)
-                goto out;
+        n = iov_iter_get_pages(iter, sgl->pages, len, ALG_MAX_PAGES, &off);
+        if (n < 0)
+                return n;
 
-        npages = err;
-        err = -EINVAL;
+        npages = PAGE_ALIGN(off + n);
         if (WARN_ON(npages == 0))
-                goto out;
-
-        err = 0;
+                return -EINVAL;
 
         sg_init_table(sgl->sg, npages);
 
-        for (i = 0; i < npages; i++) {
+        for (i = 0, len = n; i < npages; i++) {
                 int plen = min_t(int, len, PAGE_SIZE - off);
 
                 sg_set_page(sgl->sg + i, sgl->pages[i], plen, off);
 
                 off = 0;
                 len -= plen;
-                err += plen;
         }
-
-out:
-        return err;
+        return n;
 }
 EXPORT_SYMBOL_GPL(af_alg_make_sg);
 
diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c
index 01f56eb7816e..01da360bdb55 100644
--- a/crypto/algif_hash.c
+++ b/crypto/algif_hash.c
@@ -41,8 +41,6 @@ static int hash_sendmsg(struct kiocb *unused, struct socket *sock,
         struct sock *sk = sock->sk;
         struct alg_sock *ask = alg_sk(sk);
         struct hash_ctx *ctx = ask->private;
-        unsigned long iovlen;
-        const struct iovec *iov;
         long copied = 0;
         int err;
 
@@ -58,37 +56,28 @@ static int hash_sendmsg(struct kiocb *unused, struct socket *sock,
 
         ctx->more = 0;
 
-        for (iov = msg->msg_iter.iov, iovlen = msg->msg_iter.nr_segs; iovlen > 0;
-             iovlen--, iov++) {
-                unsigned long seglen = iov->iov_len;
-                char __user *from = iov->iov_base;
+        while (iov_iter_count(&msg->msg_iter)) {
+                int len = iov_iter_count(&msg->msg_iter);
 
-                while (seglen) {
-                        int len = min_t(unsigned long, seglen, limit);
-                        int newlen;
+                if (len > limit)
+                        len = limit;
 
-                        newlen = af_alg_make_sg(&ctx->sgl, from, len, 0);
-                        if (newlen < 0) {
-                                err = copied ? 0 : newlen;
-                                goto unlock;
-                        }
-
-                        ahash_request_set_crypt(&ctx->req, ctx->sgl.sg, NULL,
-                                                newlen);
-
-                        err = af_alg_wait_for_completion(
-                                crypto_ahash_update(&ctx->req),
-                                &ctx->completion);
+                len = af_alg_make_sg(&ctx->sgl, &msg->msg_iter, len);
+                if (len < 0) {
+                        err = copied ? 0 : len;
+                        goto unlock;
+                }
 
-                        af_alg_free_sg(&ctx->sgl);
+                ahash_request_set_crypt(&ctx->req, ctx->sgl.sg, NULL, len);
 
-                        if (err)
-                                goto unlock;
+                err = af_alg_wait_for_completion(crypto_ahash_update(&ctx->req),
+                                                 &ctx->completion);
+                af_alg_free_sg(&ctx->sgl);
+                if (err)
+                        goto unlock;
 
-                        seglen -= newlen;
-                        from += newlen;
-                        copied += newlen;
-                }
+                copied += len;
+                iov_iter_advance(&msg->msg_iter, len);
         }
 
         err = 0;
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index c12207c8dde9..37110fd68adf 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -426,67 +426,59 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock,
                 &ctx->req));
         struct skcipher_sg_list *sgl;
         struct scatterlist *sg;
-        unsigned long iovlen;
-        const struct iovec *iov;
         int err = -EAGAIN;
         int used;
         long copied = 0;