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

Commit 6fb5032e authored by Dmitry Kasatkin's avatar Dmitry Kasatkin Committed by Mimi Zohar
Browse files

VFS: refactor vfs_read() 



integrity_kernel_read() duplicates the file read operations code
in vfs_read(). This patch refactors vfs_read() code creating a
helper function __vfs_read(). It is used by both vfs_read() and
integrity_kernel_read().

Signed-off-by: default avatarDmitry Kasatkin <d.kasatkin@samsung.com>
Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
parent c57782c1

fs/read_write.c

+18 −6
Original line number Diff line number Diff line
@@ -412,6 +412,23 @@ ssize_t new_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *p 


EXPORT_SYMBOL(new_sync_read);



ssize_t __vfs_read(struct file *file, char __user *buf, size_t count,

		   loff_t *pos)

{

	ssize_t ret;



	if (file->f_op->read)

		ret = file->f_op->read(file, buf, count, pos);

	else if (file->f_op->aio_read)

		ret = do_sync_read(file, buf, count, pos);

	else if (file->f_op->read_iter)

		ret = new_sync_read(file, buf, count, pos);

	else

		ret = -EINVAL;



	return ret;

}



ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)

{

	ssize_t ret;
@@ -426,12 +443,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) 
	ret = rw_verify_area(READ, file, pos, count);

	if (ret >= 0) {

		count = ret;

		if (file->f_op->read)

			ret = file->f_op->read(file, buf, count, pos);

		else if (file->f_op->aio_read)

			ret = do_sync_read(file, buf, count, pos);

		else

			ret = new_sync_read(file, buf, count, pos);

		ret = __vfs_read(file, buf, count, pos);

		if (ret > 0) {

			fsnotify_access(file);

			add_rchar(current, ret);

include/linux/fs.h

+1 −0
Original line number Diff line number Diff line
@@ -1527,6 +1527,7 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector, 
			      struct iovec *fast_pointer,

			      struct iovec **ret_pointer);



extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);

extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);

extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);

extern ssize_t vfs_readv(struct file *, const struct iovec __user *,

security/integrity/iint.c

+3 −7
Original line number Diff line number Diff line
@@ -184,20 +184,16 @@ int integrity_kernel_read(struct file *file, loff_t offset, 
{

	mm_segment_t old_fs;

	char __user *buf = (char __user *)addr;

	ssize_t ret = -EINVAL;

	ssize_t ret;



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

		return -EBADF;



	old_fs = get_fs();

	set_fs(get_ds());

	if (file->f_op->read)

		ret = file->f_op->read(file, buf, count, &offset);

	else if (file->f_op->aio_read)

		ret = do_sync_read(file, buf, count, &offset);

	else if (file->f_op->read_iter)

		ret = new_sync_read(file, buf, count, &offset);

	ret = __vfs_read(file, buf, count, &offset);

	set_fs(old_fs);



	return ret;

}