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

Commit c0371da6 authored by Al Viro's avatar Al Viro
Browse files

put iov_iter into msghdr 



Note that the code _using_ ->msg_iter at that point will be very
unhappy with anything other than unshifted iovec-backed iov_iter.
We still need to convert users to proper primitives.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent d838df2e

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/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/tun.c

+2 −6
Original line number Diff line number Diff line
@@ -1449,13 +1449,11 @@ static int tun_sendmsg(struct kiocb *iocb, struct socket *sock, 
	int ret;

	struct tun_file *tfile = container_of(sock, struct tun_file, socket);

	struct tun_struct *tun = __tun_get(tfile);

	struct iov_iter from;



	if (!tun)

		return -EBADFD;



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

	ret = tun_get_user(tun, tfile, m->msg_control, &from,

	ret = tun_get_user(tun, tfile, m->msg_control, &m->msg_iter,

			   m->msg_flags & MSG_DONTWAIT);

	tun_put(tun);

	return ret;
@@ -1467,7 +1465,6 @@ static int tun_recvmsg(struct kiocb *iocb, struct socket *sock, 
{

	struct tun_file *tfile = container_of(sock, struct tun_file, socket);

	struct tun_struct *tun = __tun_get(tfile);

	struct iov_iter to;

	int ret;



	if (!tun)
@@ -1482,8 +1479,7 @@ static int tun_recvmsg(struct kiocb *iocb, struct socket *sock, 
					 SOL_PACKET, TUN_TX_TIMESTAMP);

		goto out;

	}

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

	ret = tun_do_read(tun, tfile, &to, flags & MSG_DONTWAIT);

	ret = tun_do_read(tun, tfile, &m->msg_iter, flags & MSG_DONTWAIT);

	if (ret > total_len) {

		m->msg_flags |= MSG_TRUNC;

		ret = flags & MSG_TRUNC ? ret : total_len;

drivers/vhost/net.c

+3 −5
Original line number Diff line number Diff line
@@ -342,7 +342,6 @@ static void handle_tx(struct vhost_net *net) 
		.msg_namelen = 0,

		.msg_control = NULL,

		.msg_controllen = 0,

		.msg_iov = vq->iov,

		.msg_flags = MSG_DONTWAIT,

	};

	size_t len, total_len = 0;
@@ -396,8 +395,8 @@ static void handle_tx(struct vhost_net *net) 
		}

		/* Skip header. TODO: support TSO. */

		s = move_iovec_hdr(vq->iov, nvq->hdr, hdr_size, out);

		msg.msg_iovlen = out;

		len = iov_length(vq->iov, out);

		iov_iter_init(&msg.msg_iter, WRITE, vq->iov, out, len);

		/* Sanity check */

		if (!len) {

			vq_err(vq, "Unexpected header len for TX: "
@@ -562,7 +561,6 @@ static void handle_rx(struct vhost_net *net) 
		.msg_namelen = 0,

		.msg_control = NULL, /* FIXME: get and handle RX aux data. */

		.msg_controllen = 0,

		.msg_iov = vq->iov,

		.msg_flags = MSG_DONTWAIT,

	};

	struct virtio_net_hdr_mrg_rxbuf hdr = {
@@ -600,7 +598,7 @@ static void handle_rx(struct vhost_net *net) 
			break;

		/* On overrun, truncate and discard */

		if (unlikely(headcount > UIO_MAXIOV)) {

			msg.msg_iovlen = 1;

			iov_iter_init(&msg.msg_iter, READ, vq->iov, 1, 1);

			err = sock->ops->recvmsg(NULL, sock, &msg,

						 1, MSG_DONTWAIT | MSG_TRUNC);

			pr_debug("Discarded rx packet: len %zd\n", sock_len);
@@ -626,7 +624,7 @@ static void handle_rx(struct vhost_net *net) 
			/* Copy the header for use in VIRTIO_NET_F_MRG_RXBUF:

			 * needed because recvmsg can modify msg_iov. */

			copy_iovec_hdr(vq->iov, nvq->hdr, sock_hlen, in);

		msg.msg_iovlen = in;

		iov_iter_init(&msg.msg_iter, READ, vq->iov, in, sock_len);

		err = sock->ops->recvmsg(NULL, sock, &msg,

					 sock_len, MSG_DONTWAIT | MSG_TRUNC);

		/* Userspace might have consumed the packet meanwhile: