Commit 75f4d9af authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pull-iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull iov_iter updates from Al Viro:
 "iov_iter work; most of that is about getting rid of direction
  misannotations and (hopefully) preventing more of the same for the
  future"

* tag 'pull-iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  use less confusing names for iov_iter direction initializers
  iov_iter: saner checks for attempt to copy to/from iterator
  [xen] fix "direction" argument of iov_iter_kvec()
  [vhost] fix 'direction' argument of iov_iter_{init,bvec}()
  [target] fix iov_iter_bvec() "direction" argument
  [s390] memcpy_real(): WRITE is "data source", not destination...
  [s390] zcore: WRITE is "data source", not destination...
  [infiniband] READ is "data destination", not source...
  [fsi] WRITE is "data source", not destination...
  [s390] copy_oldmem_kernel() - WRITE is "data source", not destination
  csum_and_copy_to_iter(): handle ITER_DISCARD
  get rid of unlikely() on page_copy_sane() calls
parents 268369b1 de4eda9d

arch/s390/kernel/crash_dump.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ int copy_oldmem_kernel(void *dst, unsigned long src, size_t count) 


	kvec.iov_base = dst;

	kvec.iov_len = count;

	iov_iter_kvec(&iter, WRITE, &kvec, 1, count);

	iov_iter_kvec(&iter, ITER_DEST, &kvec, 1, count);

	if (copy_oldmem_iter(&iter, src, count) < count)

		return -EFAULT;

	return 0;

arch/s390/mm/maccess.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ int memcpy_real(void *dest, unsigned long src, size_t count) 


	kvec.iov_base = dest;

	kvec.iov_len = count;

	iov_iter_kvec(&iter, WRITE, &kvec, 1, count);

	iov_iter_kvec(&iter, ITER_DEST, &kvec, 1, count);

	if (memcpy_real_iter(&iter, src, count) < count)

		return -EFAULT;

	return 0;

arch/x86/kernel/cpu/microcode/intel.c

+1 −1
Original line number Diff line number Diff line
@@ -908,7 +908,7 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device, 


	kvec.iov_base = (void *)firmware->data;

	kvec.iov_len = firmware->size;

	iov_iter_kvec(&iter, WRITE, &kvec, 1, firmware->size);

	iov_iter_kvec(&iter, ITER_SOURCE, &kvec, 1, firmware->size);

	ret = generic_load_microcode(cpu, &iter);



	release_firmware(firmware);

arch/x86/kernel/crash_dump_64.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ ssize_t elfcorehdr_read(char *buf, size_t count, u64 *ppos) 
	struct kvec kvec = { .iov_base = buf, .iov_len = count };

	struct iov_iter iter;



	iov_iter_kvec(&iter, READ, &kvec, 1, count);

	iov_iter_kvec(&iter, ITER_DEST, &kvec, 1, count);



	return read_from_oldmem(&iter, count, ppos,

				cc_platform_has(CC_ATTR_GUEST_MEM_ENCRYPT));

crypto/testmgr.c

+2 −2
Original line number Diff line number Diff line
@@ -766,7 +766,7 @@ static int build_cipher_test_sglists(struct cipher_test_sglists *tsgls, 
	struct iov_iter input;

	int err;



	iov_iter_kvec(&input, WRITE, inputs, nr_inputs, src_total_len);

	iov_iter_kvec(&input, ITER_SOURCE, inputs, nr_inputs, src_total_len);

	err = build_test_sglist(&tsgls->src, cfg->src_divs, alignmask,

				cfg->inplace_mode != OUT_OF_PLACE ?

					max(dst_total_len, src_total_len) :
@@ -1180,7 +1180,7 @@ static int build_hash_sglist(struct test_sglist *tsgl, 


	kv.iov_base = (void *)vec->plaintext;

	kv.iov_len = vec->psize;

	iov_iter_kvec(&input, WRITE, &kv, 1, vec->psize);

	iov_iter_kvec(&input, ITER_SOURCE, &kv, 1, vec->psize);

	return build_test_sglist(tsgl, cfg->src_divs, alignmask, vec->psize,

				 &input, divs);

}