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

Commit 5faf153e authored by Al Viro's avatar Al Viro
Browse files

don't call file_pos_write() if vfs_{read,write}{,v}() fails 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 13f8e981

fs/read_write.c

+12 −6
Original line number Diff line number Diff line
@@ -477,6 +477,7 @@ SYSCALL_DEFINE3(read, unsigned int, fd, char __user *, buf, size_t, count) 
	if (f.file) {

		loff_t pos = file_pos_read(f.file);

		ret = vfs_read(f.file, buf, count, &pos);

		if (ret >= 0)

			file_pos_write(f.file, pos);

		fdput(f);

	}
@@ -492,6 +493,7 @@ SYSCALL_DEFINE3(write, unsigned int, fd, const char __user *, buf, 
	if (f.file) {

		loff_t pos = file_pos_read(f.file);

		ret = vfs_write(f.file, buf, count, &pos);

		if (ret >= 0)

			file_pos_write(f.file, pos);

		fdput(f);

	}
@@ -780,6 +782,7 @@ SYSCALL_DEFINE3(readv, unsigned long, fd, const struct iovec __user *, vec, 
	if (f.file) {

		loff_t pos = file_pos_read(f.file);

		ret = vfs_readv(f.file, vec, vlen, &pos);

		if (ret >= 0)

			file_pos_write(f.file, pos);

		fdput(f);

	}
@@ -799,6 +802,7 @@ SYSCALL_DEFINE3(writev, unsigned long, fd, const struct iovec __user *, vec, 
	if (f.file) {

		loff_t pos = file_pos_read(f.file);

		ret = vfs_writev(f.file, vec, vlen, &pos);

		if (ret >= 0)

			file_pos_write(f.file, pos);

		fdput(f);

	}
@@ -959,6 +963,7 @@ COMPAT_SYSCALL_DEFINE3(readv, unsigned long, fd, 
		return -EBADF;

	pos = f.file->f_pos;

	ret = compat_readv(f.file, vec, vlen, &pos);

	if (ret >= 0)

		f.file->f_pos = pos;

	fdput(f);

	return ret;
@@ -1025,6 +1030,7 @@ COMPAT_SYSCALL_DEFINE3(writev, unsigned long, fd, 
		return -EBADF;

	pos = f.file->f_pos;

	ret = compat_writev(f.file, vec, vlen, &pos);

	if (ret >= 0)

		f.file->f_pos = pos;

	fdput(f);

	return ret;