4 files changed, 17 insertions, 18 deletions

diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index 9ee71cb276d7..fbaf3bd05b2e 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -1636,17 +1636,14 @@ static int
 ip_vs_receive(struct socket *sock, char *buffer, const size_t buflen)
 {
         struct msghdr           msg = {NULL,};
-        struct kvec             iov;
+        struct kvec             iov = {buffer, buflen};
         int                     len;
 
         EnterFunction(7);
 
         /* Receive a packet */
-        iov.iov_base     = buffer;
-        iov.iov_len      = (size_t)buflen;
-
-        len = kernel_recvmsg(sock, &msg, &iov, 1, buflen, MSG_DONTWAIT);
-
+        iov_iter_kvec(&msg.msg_iter, READ | ITER_KVEC, &iov, 1, buflen);
+        len = sock_recvmsg(sock, &msg, MSG_DONTWAIT);
         if (len < 0)
                 return len;
 
diff --git a/net/smc/smc_clc.c b/net/smc/smc_clc.c
index 1800e16b2a02..511548085d16 100644
--- a/net/smc/smc_clc.c
+++ b/net/smc/smc_clc.c
@@ -35,7 +35,7 @@ int smc_clc_wait_msg(struct smc_sock *smc, void *buf, int buflen,
         struct smc_clc_msg_hdr *clcm = buf;
         struct msghdr msg = {NULL, 0};
         int reason_code = 0;
-        struct kvec vec;
+        struct kvec vec = {buf, buflen};
         int len, datlen;
         int krflags;
 
@@ -43,12 +43,15 @@ int smc_clc_wait_msg(struct smc_sock *smc, void *buf, int buflen,
          * so we don't consume any subsequent CLC message or payload data
          * in the TCP byte stream
          */
-        vec.iov_base = buf;
-        vec.iov_len = buflen;
+        /*
+         * Caller must make sure that buflen is no less than
+         * sizeof(struct smc_clc_msg_hdr)
+         */
         krflags = MSG_PEEK | MSG_WAITALL;
         smc->clcsock->sk->sk_rcvtimeo = CLC_WAIT_TIME;
-        len = kernel_recvmsg(smc->clcsock, &msg, &vec, 1,
-                             sizeof(struct smc_clc_msg_hdr), krflags);
+        iov_iter_kvec(&msg.msg_iter, READ | ITER_KVEC, &vec, 1,
+                        sizeof(struct smc_clc_msg_hdr));
+        len = sock_recvmsg(smc->clcsock, &msg, krflags);
         if (signal_pending(current)) {
                 reason_code = -EINTR;
                 clc_sk->sk_err = EINTR;
@@ -83,12 +86,11 @@ int smc_clc_wait_msg(struct smc_sock *smc, void *buf, int buflen,
         }
 
         /* receive the complete CLC message */
-        vec.iov_base = buf;
-        vec.iov_len = buflen;
         memset(&msg, 0, sizeof(struct msghdr));
+        iov_iter_kvec(&msg.msg_iter, READ | ITER_KVEC, &vec, 1, buflen);
         krflags = MSG_WAITALL;
         smc->clcsock->sk->sk_rcvtimeo = CLC_WAIT_TIME;
-        len = kernel_recvmsg(smc->clcsock, &msg, &vec, 1, datlen, krflags);
+        len = sock_recvmsg(smc->clcsock, &msg, krflags);
         if (len < datlen) {
                 smc->sk.sk_err = EPROTO;
                 reason_code = -EPROTO;
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index ff8e06cd067e..5570719e4787 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -338,8 +338,8 @@ static int svc_recvfrom(struct svc_rqst *rqstp, struct kvec *iov, int nr,
         rqstp->rq_xprt_hlen = 0;
 
         clear_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags);
-        len = kernel_recvmsg(svsk->sk_sock, &msg, iov, nr, buflen,
-                                msg.msg_flags);
+        iov_iter_kvec(&msg.msg_iter, READ | ITER_KVEC, iov, nr, buflen);
+        len = sock_recvmsg(svsk->sk_sock, &msg, msg.msg_flags);
         /* If we read a full record, then assume there may be more
          * data to read (stream based sockets only!)
          */
diff --git a/net/tipc/server.c b/net/tipc/server.c
index d60c30342327..78a292a84afc 100644
--- a/net/tipc/server.c
+++ b/net/tipc/server.c
@@ -264,8 +264,8 @@ static int tipc_receive_from_sock(struct tipc_conn *con)
         iov.iov_base = buf;
         iov.iov_len = s->max_rcvbuf_size;
         msg.msg_name = &addr;
-        ret = kernel_recvmsg(con->sock, &msg, &iov, 1, iov.iov_len,
-                             MSG_DONTWAIT);
+        iov_iter_kvec(&msg.msg_iter, READ | ITER_KVEC, &iov, 1, iov.iov_len);
+        ret = sock_recvmsg(con->sock, &msg, MSG_DONTWAIT);
         if (ret <= 0) {
                 kmem_cache_free(s->rcvbuf_cache, buf);
                 goto out_close;