Commit 89cd35c5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro
Browse files

iov_iter: transparently handle compat iovecs in import_iovec 



Use in compat_syscall to import either native or the compat iovecs, and
remove the now superflous compat_import_iovec.

This removes the need for special compat logic in most callers, and
the remaining ones can still be simplified by using __import_iovec
with a bool compat parameter.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent bfdc5970

block/scsi_ioctl.c

+2 −10
Original line number Diff line number Diff line
@@ -333,16 +333,8 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, 
		struct iov_iter i;

		struct iovec *iov = NULL;



#ifdef CONFIG_COMPAT

		if (in_compat_syscall())

			ret = compat_import_iovec(rq_data_dir(rq),

				   hdr->dxferp, hdr->iovec_count,

				   0, &iov, &i);

		else

#endif

			ret = import_iovec(rq_data_dir(rq),

				   hdr->dxferp, hdr->iovec_count,

				   0, &iov, &i);

		ret = import_iovec(rq_data_dir(rq), hdr->dxferp,

				   hdr->iovec_count, 0, &iov, &i);

		if (ret < 0)

			goto out_free_cdb;

drivers/scsi/sg.c

+1 −8
Original line number Diff line number Diff line
@@ -1820,14 +1820,7 @@ sg_start_req(Sg_request *srp, unsigned char *cmd) 
		struct iovec *iov = NULL;

		struct iov_iter i;



#ifdef CONFIG_COMPAT

		if (in_compat_syscall())

			res = compat_import_iovec(rw, hp->dxferp, iov_count,

						  0, &iov, &i);

		else

#endif

			res = import_iovec(rw, hp->dxferp, iov_count,

					   0, &iov, &i);

		res = import_iovec(rw, hp->dxferp, iov_count, 0, &iov, &i);

		if (res < 0)

			return res;

fs/aio.c

+2 −6
Original line number Diff line number Diff line
@@ -1489,12 +1489,8 @@ static ssize_t aio_setup_rw(int rw, const struct iocb *iocb, 
		*iovec = NULL;

		return ret;

	}

#ifdef CONFIG_COMPAT

	if (compat)

		return compat_import_iovec(rw, buf, len, UIO_FASTIOV, iovec,

				iter);

#endif

	return import_iovec(rw, buf, len, UIO_FASTIOV, iovec, iter);



	return __import_iovec(rw, buf, len, UIO_FASTIOV, iovec, iter, compat);

}



static inline void aio_rw_done(struct kiocb *req, ssize_t ret)

fs/io_uring.c

+8 −12
Original line number Diff line number Diff line
@@ -2846,13 +2846,8 @@ static ssize_t __io_import_iovec(int rw, struct io_kiocb *req, 
		return ret;

	}



#ifdef CONFIG_COMPAT

	if (req->ctx->compat)

		return compat_import_iovec(rw, buf, sqe_len, UIO_FASTIOV,

						iovec, iter);

#endif



	return import_iovec(rw, buf, sqe_len, UIO_FASTIOV, iovec, iter);

	return __import_iovec(rw, buf, sqe_len, UIO_FASTIOV, iovec, iter,

			      req->ctx->compat);

}



static ssize_t io_import_iovec(int rw, struct io_kiocb *req,
@@ -4166,8 +4161,9 @@ static int __io_recvmsg_copy_hdr(struct io_kiocb *req, 
				sr->len);

		iomsg->iov = NULL;

	} else {

		ret = import_iovec(READ, uiov, iov_len, UIO_FASTIOV,

					&iomsg->iov, &iomsg->msg.msg_iter);

		ret = __import_iovec(READ, uiov, iov_len, UIO_FASTIOV,

				     &iomsg->iov, &iomsg->msg.msg_iter,

				     false);

		if (ret > 0)

			ret = 0;

	}
@@ -4207,9 +4203,9 @@ static int __io_compat_recvmsg_copy_hdr(struct io_kiocb *req, 
		sr->len = iomsg->iov[0].iov_len;

		iomsg->iov = NULL;

	} else {

		ret = compat_import_iovec(READ, uiov, len, UIO_FASTIOV,

						&iomsg->iov,

						&iomsg->msg.msg_iter);

		ret = __import_iovec(READ, (struct iovec __user *)uiov, len,

				   UIO_FASTIOV, &iomsg->iov,

				   &iomsg->msg.msg_iter, true);

		if (ret < 0)

			return ret;

	}

fs/read_write.c

+4 −2
Original line number Diff line number Diff line
@@ -1078,7 +1078,8 @@ static size_t compat_readv(struct file *file, 
	struct iov_iter iter;

	ssize_t ret;



	ret = compat_import_iovec(READ, vec, vlen, UIO_FASTIOV, &iov, &iter);

	ret = import_iovec(READ, (const struct iovec __user *)vec, vlen,

			   UIO_FASTIOV, &iov, &iter);

	if (ret >= 0) {

		ret = do_iter_read(file, &iter, pos, flags);

		kfree(iov);
@@ -1186,7 +1187,8 @@ static size_t compat_writev(struct file *file, 
	struct iov_iter iter;

	ssize_t ret;



	ret = compat_import_iovec(WRITE, vec, vlen, UIO_FASTIOV, &iov, &iter);

	ret = import_iovec(WRITE, (const struct iovec __user *)vec, vlen,

			   UIO_FASTIOV, &iov, &iter);

	if (ret >= 0) {

		file_start_write(file);

		ret = do_iter_write(file, &iter, pos, flags);