Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e5f59aa authored by David S. Miller's avatar David S. Miller
Browse files

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



More iov_iter work for the networking from Al Viro.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6c702fab 218321e7

crypto/algif_hash.c

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static int hash_sendmsg(struct kiocb *unused, struct socket *sock, 
	struct alg_sock *ask = alg_sk(sk);

	struct hash_ctx *ctx = ask->private;

	unsigned long iovlen;

	struct iovec *iov;

	const struct iovec *iov;

	long copied = 0;

	int err;
@@ -58,7 +58,7 @@ static int hash_sendmsg(struct kiocb *unused, struct socket *sock, 


	ctx->more = 0;



	for (iov = msg->msg_iov, iovlen = msg->msg_iovlen; iovlen > 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;

crypto/algif_skcipher.c

+2 −2
Original line number Diff line number Diff line
@@ -429,13 +429,13 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock, 
	struct skcipher_sg_list *sgl;

	struct scatterlist *sg;

	unsigned long iovlen;

	struct iovec *iov;

	const struct iovec *iov;

	int err = -EAGAIN;

	int used;

	long copied = 0;



	lock_sock(sk);

	for (iov = msg->msg_iov, iovlen = msg->msg_iovlen; iovlen > 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;

drivers/misc/vmw_vmci/vmci_queue_pair.c

+9 −8
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/uio.h>

#include <linux/wait.h>

#include <linux/vmalloc.h>

#include <linux/skbuff.h>



#include "vmci_handle_array.h"

#include "vmci_queue_pair.h"
@@ -429,11 +430,11 @@ static int __qp_memcpy_from_queue(void *dest, 
			to_copy = size - bytes_copied;



		if (is_iovec) {

			struct iovec *iov = (struct iovec *)dest;

			struct msghdr *msg = dest;

			int err;



			/* The iovec will track bytes_copied internally. */

			err = memcpy_toiovec(iov, (u8 *)va + page_offset,

			err = memcpy_to_msg(msg, (u8 *)va + page_offset,

					     to_copy);

			if (err != 0) {

				if (kernel_if->host)
@@ -3264,13 +3265,13 @@ EXPORT_SYMBOL_GPL(vmci_qpair_enquev); 
 * of bytes dequeued or < 0 on error.

 */

ssize_t vmci_qpair_dequev(struct vmci_qp *qpair,

			  void *iov,

			  struct msghdr *msg,

			  size_t iov_size,

			  int buf_type)

{

	ssize_t result;



	if (!qpair || !iov)

	if (!qpair)

		return VMCI_ERROR_INVALID_ARGS;



	qp_lock(qpair);
@@ -3279,7 +3280,7 @@ ssize_t vmci_qpair_dequev(struct vmci_qp *qpair, 
		result = qp_dequeue_locked(qpair->produce_q,

					   qpair->consume_q,

					   qpair->consume_q_size,

					   iov, iov_size,

					   msg, iov_size,

					   qp_memcpy_from_queue_iov,

					   true);
@@ -3308,13 +3309,13 @@ EXPORT_SYMBOL_GPL(vmci_qpair_dequev); 
 * of bytes peeked or < 0 on error.

 */

ssize_t vmci_qpair_peekv(struct vmci_qp *qpair,

			 void *iov,

			 struct msghdr *msg,

			 size_t iov_size,

			 int buf_type)

{

	ssize_t result;



	if (!qpair || !iov)

	if (!qpair)

		return VMCI_ERROR_INVALID_ARGS;



	qp_lock(qpair);
@@ -3323,7 +3324,7 @@ ssize_t vmci_qpair_peekv(struct vmci_qp *qpair, 
		result = qp_dequeue_locked(qpair->produce_q,

					   qpair->consume_q,

					   qpair->consume_q_size,

					   iov, iov_size,

					   msg, iov_size,

					   qp_memcpy_from_queue_iov,

					   false);

drivers/net/macvtap.c

+2 −6
Original line number Diff line number Diff line
@@ -1095,9 +1095,7 @@ static int macvtap_sendmsg(struct kiocb *iocb, struct socket *sock, 
			   struct msghdr *m, size_t total_len)

{

	struct macvtap_queue *q = container_of(sock, struct macvtap_queue, sock);

	struct iov_iter from;

	iov_iter_init(&from, WRITE, m->msg_iov, m->msg_iovlen, total_len);

	return macvtap_get_user(q, m, &from, m->msg_flags & MSG_DONTWAIT);

	return macvtap_get_user(q, m, &m->msg_iter, m->msg_flags & MSG_DONTWAIT);

}



static int macvtap_recvmsg(struct kiocb *iocb, struct socket *sock,
@@ -1105,12 +1103,10 @@ static int macvtap_recvmsg(struct kiocb *iocb, struct socket *sock, 
			   int flags)

{

	struct macvtap_queue *q = container_of(sock, struct macvtap_queue, sock);

	struct iov_iter to;

	int ret;

	if (flags & ~(MSG_DONTWAIT|MSG_TRUNC))

		return -EINVAL;

	iov_iter_init(&to, READ, m->msg_iov, m->msg_iovlen, total_len);

	ret = macvtap_do_read(q, &to, flags & MSG_DONTWAIT);

	ret = macvtap_do_read(q, &m->msg_iter, flags & MSG_DONTWAIT);

	if (ret > total_len) {

		m->msg_flags |= MSG_TRUNC;

		ret = flags & MSG_TRUNC ? ret : total_len;

drivers/net/ppp/ppp_generic.c

+3 −1
Original line number Diff line number Diff line
@@ -417,6 +417,7 @@ static ssize_t ppp_read(struct file *file, char __user *buf, 
	ssize_t ret;

	struct sk_buff *skb = NULL;

	struct iovec iov;

	struct iov_iter to;



	ret = count;
@@ -462,7 +463,8 @@ static ssize_t ppp_read(struct file *file, char __user *buf, 
	ret = -EFAULT;

	iov.iov_base = buf;

	iov.iov_len = count;

	if (skb_copy_datagram_iovec(skb, 0, &iov, skb->len))

	iov_iter_init(&to, READ, &iov, 1, count);

	if (skb_copy_datagram_iter(skb, 0, &to, skb->len))

		goto outf;

	ret = skb->len;