fs: remove local variable copy of f_pos to enable thread-safe updates
PATCH 1/1 fs: remove local variable copy of f_pos to enable thread-safe updates
From: Matti Linnanvuori <[email protected]>
Remove local variable copy of f_pos to enable thread-safe updates in implementation functions of system calls read, readv, write and writev.
---
fs/fs-read_write.c 2008-05-02 11:57:17.011641000 +0300 renamed from fs/fs-read_write.c 2008-05-02 11:54:04.715996700 +0300 +4 -22
@@ -348,16 +348,6 @@ ssize_t vfs_write(struct file *file, con EXPORT_SYMBOL(vfs_write); -static inline loff_t file_pos_read(struct file *file) -{ - return file->f_pos; -} - -static inline void file_pos_write(struct file *file, loff_t pos) -{ - file->f_pos = pos; -} - asmlinkage ssize_t sys_read(unsigned int fd, char __user * buf, size_t count) { struct file *file;
@@ -366,10 +356,8 @@ asmlinkage ssize_t sys_read(unsigned int file = fget_light(fd, &fput_needed); if (file) { - loff_t pos = file_pos_read(file); trace_mark(fs_read, "fd %u count %zu", fd, count); - ret = vfs_read(file, buf, count, &pos); - file_pos_write(file, pos); + ret = vfs_read(file, buf, count, &file->f_pos); fput_light(file, fput_needed); }
@@ -384,10 +372,8 @@ asmlinkage ssize_t sys_write(unsigned in file = fget_light(fd, &fput_needed); if (file) { - loff_t pos = file_pos_read(file); trace_mark(fs_write, "fd %u count %zu", fd, count); - ret = vfs_write(file, buf, count, &pos); - file_pos_write(file, pos); + ret = vfs_write(file, buf, count, &file->f_pos); fput_light(file, fput_needed); }
@@ -679,10 +665,8 @@ sys_readv(unsigned long fd, const struct file = fget_light(fd, &fput_needed); if (file) { - loff_t pos = file_pos_read(file); trace_mark(fs_readv, "fd %lu vlen %lu", fd, vlen); - ret = vfs_readv(file, vec, vlen, &pos); - file_pos_write(file, pos); + ret = vfs_readv(file, vec, vlen, &file->f_pos); fput_light(file, fput_needed); }
@@ -701,10 +685,8 @@ sys_writev(unsigned long fd, const struc file = fget_light(fd, &fput_needed); if (file) { - loff_t pos = file_pos_read(file); trace_mark(fs_writev, "fd %lu vlen %lu", fd, vlen); - ret = vfs_writev(file, vec, vlen, &pos); - file_pos_write(file, pos); + ret = vfs_writev(file, vec, vlen, &file->f_pos); fput_light(file, fput_needed); }
____________________________________________________________________________________
Be a better friend, newshound, and
know-it-all with Yahoo! Mobile. Try it now. http://mobile.yahoo.com/;_ylt=Ahu06i62sR8HDtDypao8Wcj9tAcJ
Al Viro
maintainerQuoted 4 lines · Matti Linnanvuori
From: Matti Linnanvuori <[email protected]>
Remove local variable copy of
f_posto enable thread-safe updates in implementation functions of system calls read, readv, write and writev.
... and we are back to square one with racy instances of ->read() that will use *pos twice, leaving a window for e.g. lseek() to invalidate e.g. wraparound tests. Not that deciding what to do at the end of e.g. read() with lseek() happening in the middle would be fun anyway - esp. since you don't remember the kind of seek it had been.
Go argue that with Linus.