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

Commit f94aa7c7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vfs fixes from Al Viro:
 "A couple of fixes, both -stable fodder.  The O_SYNC bug is fairly
  old..."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix a kmap leak in virtio_console
  fix O_SYNC|O_APPEND syncing the wrong range on write()
parents 9c1db779 c9efe511

drivers/char/virtio_console.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -890,12 +890,10 @@ static int pipe_to_sg(struct pipe_inode_info *pipe, struct pipe_buffer *buf, 
	} else {

	} else {

		/* Failback to copying a page */

		/* Failback to copying a page */

		struct page *page = alloc_page(GFP_KERNEL);

		struct page *page = alloc_page(GFP_KERNEL);

		char *src = buf->ops->map(pipe, buf, 1);

		char *src;

		char *dst;





		if (!page)

		if (!page)

			return -ENOMEM;

			return -ENOMEM;

		dst = kmap(page);





		offset = sd->pos & ~PAGE_MASK;

		offset = sd->pos & ~PAGE_MASK;
@@ -903,9 +901,8 @@ static int pipe_to_sg(struct pipe_inode_info *pipe, struct pipe_buffer *buf, 
		if (len + offset > PAGE_SIZE)

		if (len + offset > PAGE_SIZE)

			len = PAGE_SIZE - offset;

			len = PAGE_SIZE - offset;





		memcpy(dst + offset, src + buf->offset, len);

		src = buf->ops->map(pipe, buf, 1);



		memcpy(page_address(page) + offset, src + buf->offset, len);

		kunmap(page);

		buf->ops->unmap(pipe, buf, src);

		buf->ops->unmap(pipe, buf, src);





		sg_set_page(&(sgl->sg[sgl->n]), page, len, offset);

		sg_set_page(&(sgl->sg[sgl->n]), page, len, offset);

fs/cifs/file.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2559,8 +2559,8 @@ cifs_writev(struct kiocb *iocb, const struct iovec *iov, 
	if (rc > 0) {

	if (rc > 0) {

		ssize_t err;

		ssize_t err;





		err = generic_write_sync(file, pos, rc);

		err = generic_write_sync(file, iocb->ki_pos - rc, rc);

		if (err < 0 && rc > 0)

		if (err < 0)

			rc = err;

			rc = err;

	}

	}

fs/ext4/file.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -152,7 +152,7 @@ ext4_file_dio_write(struct kiocb *iocb, const struct iovec *iov, 
	if (ret > 0) {

	if (ret > 0) {

		ssize_t err;

		ssize_t err;





		err = generic_write_sync(file, pos, ret);

		err = generic_write_sync(file, iocb->ki_pos - ret, ret);

		if (err < 0 && ret > 0)

		if (err < 0 && ret > 0)

			ret = err;

			ret = err;

	}

	}

fs/ntfs/file.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2134,7 +2134,7 @@ static ssize_t ntfs_file_aio_write(struct kiocb *iocb, const struct iovec *iov, 
	ret = ntfs_file_aio_write_nolock(iocb, iov, nr_segs, &iocb->ki_pos);

	ret = ntfs_file_aio_write_nolock(iocb, iov, nr_segs, &iocb->ki_pos);

	mutex_unlock(&inode->i_mutex);

	mutex_unlock(&inode->i_mutex);

	if (ret > 0) {

	if (ret > 0) {

		int err = generic_write_sync(file, pos, ret);

		int err = generic_write_sync(file, iocb->ki_pos - ret, ret);

		if (err < 0)

		if (err < 0)

			ret = err;

			ret = err;

	}

	}

fs/sync.c

+0 −17
Original line number Original line Diff line number Diff line
@@ -222,23 +222,6 @@ SYSCALL_DEFINE1(fdatasync, unsigned int, fd) 
	return do_fsync(fd, 1);

	return do_fsync(fd, 1);

}

}





/**

 * generic_write_sync - perform syncing after a write if file / inode is sync

 * @file:	file to which the write happened

 * @pos:	offset where the write started

 * @count:	length of the write

 *

 * This is just a simple wrapper about our general syncing function.

 */

int generic_write_sync(struct file *file, loff_t pos, loff_t count)

{

	if (!(file->f_flags & O_DSYNC) && !IS_SYNC(file->f_mapping->host))

		return 0;

	return vfs_fsync_range(file, pos, pos + count - 1,

			       (file->f_flags & __O_SYNC) ? 0 : 1);

}

EXPORT_SYMBOL(generic_write_sync);



/*

/*

 * sys_sync_file_range() permits finely controlled syncing over a segment of

 * sys_sync_file_range() permits finely controlled syncing over a segment of

 * a file in the range offset .. (offset+nbytes-1) inclusive.  If nbytes is

 * a file in the range offset .. (offset+nbytes-1) inclusive.  If nbytes is