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

Commit 6949a631 authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Linus Torvalds
Browse files

preadv/pwritev: create compat_writev() 



Factor out some code from compat_sys_writev() which can be shared with the
upcoming compat_sys_pwritev().

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: <linux-api@vger.kernel.org>
Cc: <linux-arch@vger.kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dac12138

fs/compat.c

+18 −7
Original line number Diff line number Diff line
@@ -1232,15 +1232,12 @@ compat_sys_readv(unsigned long fd, const struct compat_iovec __user *vec, 
	return ret;

}



asmlinkage ssize_t

compat_sys_writev(unsigned long fd, const struct compat_iovec __user *vec, unsigned long vlen)

static size_t compat_writev(struct file *file,

			    const struct compat_iovec __user *vec,

			    unsigned long vlen, loff_t *pos)

{

	struct file *file;

	ssize_t ret = -EBADF;



	file = fget(fd);

	if (!file)

		return -EBADF;

	if (!(file->f_mode & FMODE_WRITE))

		goto out;
@@ -1248,12 +1245,26 @@ compat_sys_writev(unsigned long fd, const struct compat_iovec __user *vec, unsig 
	if (!file->f_op || (!file->f_op->aio_write && !file->f_op->write))

		goto out;



	ret = compat_do_readv_writev(WRITE, file, vec, vlen, &file->f_pos);

	ret = compat_do_readv_writev(WRITE, file, vec, vlen, pos);



out:

	if (ret > 0)

		add_wchar(current, ret);

	inc_syscw(current);

	return ret;

}



asmlinkage ssize_t

compat_sys_writev(unsigned long fd, const struct compat_iovec __user *vec,

		  unsigned long vlen)

{

	struct file *file;

	ssize_t ret;



	file = fget(fd);

	if (!file)

		return -EBADF;

	ret = compat_writev(file, vec, vlen, &file->f_pos);

	fput(file);

	return ret;

}