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

Commit 03eb2a1b authored by Al Viro's avatar Al Viro Committed by Greg Kroah-Hartman
Browse files

fix "direction" argument of iov_iter_kvec() 



[ Upstream commit fc02f33787d8dd227b54f263eba983d5b249c032 ]

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 34b0fab7

drivers/xen/pvcalls-back.c

+4 −4
Original line number Diff line number Diff line
@@ -129,13 +129,13 @@ static bool pvcalls_conn_back_read(void *opaque) 
	if (masked_prod < masked_cons) {

		vec[0].iov_base = data->in + masked_prod;

		vec[0].iov_len = wanted;

		iov_iter_kvec(&msg.msg_iter, WRITE, vec, 1, wanted);

		iov_iter_kvec(&msg.msg_iter, READ, vec, 1, wanted);

	} else {

		vec[0].iov_base = data->in + masked_prod;

		vec[0].iov_len = array_size - masked_prod;

		vec[1].iov_base = data->in;

		vec[1].iov_len = wanted - vec[0].iov_len;

		iov_iter_kvec(&msg.msg_iter, WRITE, vec, 2, wanted);

		iov_iter_kvec(&msg.msg_iter, READ, vec, 2, wanted);

	}



	atomic_set(&map->read, 0);
@@ -188,13 +188,13 @@ static bool pvcalls_conn_back_write(struct sock_mapping *map) 
	if (pvcalls_mask(prod, array_size) > pvcalls_mask(cons, array_size)) {

		vec[0].iov_base = data->out + pvcalls_mask(cons, array_size);

		vec[0].iov_len = size;

		iov_iter_kvec(&msg.msg_iter, READ, vec, 1, size);

		iov_iter_kvec(&msg.msg_iter, WRITE, vec, 1, size);

	} else {

		vec[0].iov_base = data->out + pvcalls_mask(cons, array_size);

		vec[0].iov_len = array_size - pvcalls_mask(cons, array_size);

		vec[1].iov_base = data->out;

		vec[1].iov_len = size - vec[0].iov_len;

		iov_iter_kvec(&msg.msg_iter, READ, vec, 2, size);

		iov_iter_kvec(&msg.msg_iter, WRITE, vec, 2, size);

	}



	atomic_set(&map->write, 0);