summaryrefslogtreecommitdiff
path: root/fs/compat.c
diff options
context:
space:
mode:
authorAl Viro <viro@ZenIV.linux.org.uk>2012-08-20 15:28:00 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2012-08-20 10:11:47 -0700
commit0e665d5d1125f9f4ccff56a75e814f10f88861a2 (patch)
tree2f05f399fe4845893180fd9d7ea80b711e178e9e /fs/compat.c
parent90785be317dabdef6e9763e75e370991a6a46c91 (diff)
downloadlinux-3.10-0e665d5d1125f9f4ccff56a75e814f10f88861a2.tar.gz
linux-3.10-0e665d5d1125f9f4ccff56a75e814f10f88861a2.tar.bz2
linux-3.10-0e665d5d1125f9f4ccff56a75e814f10f88861a2.zip
vfs: missed source of ->f_pos races
compat_sys_{read,write}v() need the same "pass a copy of file->f_pos" thing as sys_{read,write}{,v}(). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Cc: stable@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/compat.c')
-rw-r--r--fs/compat.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/compat.c b/fs/compat.c
index 6161255fac4..1bdb350ea5d 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -1155,11 +1155,14 @@ compat_sys_readv(unsigned long fd, const struct compat_iovec __user *vec,
struct file *file;
int fput_needed;
ssize_t ret;
+ loff_t pos;
file = fget_light(fd, &fput_needed);
if (!file)
return -EBADF;
- ret = compat_readv(file, vec, vlen, &file->f_pos);
+ pos = file->f_pos;
+ ret = compat_readv(file, vec, vlen, &pos);
+ file->f_pos = pos;
fput_light(file, fput_needed);
return ret;
}
@@ -1221,11 +1224,14 @@ compat_sys_writev(unsigned long fd, const struct compat_iovec __user *vec,
struct file *file;
int fput_needed;
ssize_t ret;
+ loff_t pos;
file = fget_light(fd, &fput_needed);
if (!file)
return -EBADF;
- ret = compat_writev(file, vec, vlen, &file->f_pos);
+ pos = file->f_pos;
+ ret = compat_writev(file, vec, vlen, &pos);
+ file->f_pos = pos;
fput_light(file, fput_needed);
return ret;
}