Skip to content

Commit f94aa7c

Browse files
torvaldstorvalds
committed
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()
2 parents 9c1db77 + c9efe51 commit f94aa7c

File tree

8 files changed

+17
-31
lines changed

8 files changed

+17
-31
lines changed

‎drivers/char/virtio_console.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -890,22 +890,19 @@ static int pipe_to_sg(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
890890
} else {
891891
/* Failback to copying a page */
892892
struct page *page = alloc_page(GFP_KERNEL);
893-
char *src = buf->ops->map(pipe, buf, 1);
894-
char *dst;
893+
char *src;
895894

896895
if (!page)
897896
return -ENOMEM;
898-
dst = kmap(page);
899897

900898
offset = sd->pos & ~PAGE_MASK;
901899

902900
len = sd->len;
903901
if (len + offset > PAGE_SIZE)
904902
len = PAGE_SIZE - offset;
905903

906-
memcpy(dst + offset, src + buf->offset, len);
907-
908-
kunmap(page);
904+
src = buf->ops->map(pipe, buf, 1);
905+
memcpy(page_address(page) + offset, src + buf->offset, len);
909906
buf->ops->unmap(pipe, buf, src);
910907

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

‎fs/cifs/file.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2559,8 +2559,8 @@ cifs_writev(struct kiocb *iocb, const struct iovec *iov,
25592559
if (rc > 0) {
25602560
ssize_t err;
25612561

2562-
err = generic_write_sync(file, pos, rc);
2563-
if (err < 0 && rc > 0)
2562+
err = generic_write_sync(file, iocb->ki_pos - rc, rc);
2563+
if (err < 0)
25642564
rc = err;
25652565
}
25662566

‎fs/ext4/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ ext4_file_dio_write(struct kiocb *iocb, const struct iovec *iov,
152152
if (ret > 0) {
153153
ssize_t err;
154154

155-
err = generic_write_sync(file, pos, ret);
155+
err = generic_write_sync(file, iocb->ki_pos - ret, ret);
156156
if (err < 0 && ret > 0)
157157
ret = err;
158158
}

‎fs/ntfs/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2134,7 +2134,7 @@ static ssize_t ntfs_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
21342134
ret = ntfs_file_aio_write_nolock(iocb, iov, nr_segs, &iocb->ki_pos);
21352135
mutex_unlock(&inode->i_mutex);
21362136
if (ret > 0) {
2137-
int err = generic_write_sync(file, pos, ret);
2137+
int err = generic_write_sync(file, iocb->ki_pos - ret, ret);
21382138
if (err < 0)
21392139
ret = err;
21402140
}

‎fs/sync.c

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -222,23 +222,6 @@ SYSCALL_DEFINE1(fdatasync, unsigned int, fd)
222222
return do_fsync(fd, 1);
223223
}
224224

225-
/**
226-
* generic_write_sync - perform syncing after a write if file / inode is sync
227-
* @file: file to which the write happened
228-
* @pos: offset where the write started
229-
* @count: length of the write
230-
*
231-
* This is just a simple wrapper about our general syncing function.
232-
*/
233-
int generic_write_sync(struct file *file, loff_t pos, loff_t count)
234-
{
235-
if (!(file->f_flags & O_DSYNC) && !IS_SYNC(file->f_mapping->host))
236-
return 0;
237-
return vfs_fsync_range(file, pos, pos + count - 1,
238-
(file->f_flags & __O_SYNC) ? 0 : 1);
239-
}
240-
EXPORT_SYMBOL(generic_write_sync);
241-
242225
/*
243226
* sys_sync_file_range() permits finely controlled syncing over a segment of
244227
* a file in the range offset .. (offset+nbytes-1) inclusive. If nbytes is

‎fs/xfs/xfs_file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@ xfs_file_aio_write(
799799
XFS_STATS_ADD(xs_write_bytes, ret);
800800

801801
/* Handle various SYNC-type writes */
802-
err = generic_write_sync(file, pos, ret);
802+
err = generic_write_sync(file, iocb->ki_pos - ret, ret);
803803
if (err < 0)
804804
ret = err;
805805
}

‎include/linux/fs.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2274,7 +2274,13 @@ extern int filemap_fdatawrite_range(struct address_space *mapping,
22742274
extern int vfs_fsync_range(struct file *file, loff_t start, loff_t end,
22752275
int datasync);
22762276
extern int vfs_fsync(struct file *file, int datasync);
2277-
extern int generic_write_sync(struct file *file, loff_t pos, loff_t count);
2277+
static inline int generic_write_sync(struct file *file, loff_t pos, loff_t count)
2278+
{
2279+
if (!(file->f_flags & O_DSYNC) && !IS_SYNC(file->f_mapping->host))
2280+
return 0;
2281+
return vfs_fsync_range(file, pos, pos + count - 1,
2282+
(file->f_flags & __O_SYNC) ? 0 : 1);
2283+
}
22782284
extern void emergency_sync(void);
22792285
extern void emergency_remount(void);
22802286
#ifdef CONFIG_BLOCK

‎mm/filemap.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2553,8 +2553,8 @@ ssize_t generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
25532553
if (ret > 0) {
25542554
ssize_t err;
25552555

2556-
err = generic_write_sync(file, pos, ret);
2557-
if (err < 0 && ret > 0)
2556+
err = generic_write_sync(file, iocb->ki_pos - ret, ret);
2557+
if (err < 0)
25582558
ret = err;
25592559
}
25602560
return ret;

0 commit comments

Comments
 (0)