nfsd: fix bad offset use
Subsystems (2)
PATCH 1/1 nfsd: fix bad offset use
vfs_writev() updates the offset argument - but the code then passes the offset to vfs_fsync_range(). Since offset now points to the offset after what was just written, this is probably not what was intended
--- fs/nfsd/vfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/nfsd/vfs.c +2 -1
@@ -1013,6 +1013,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,int host_err;int stable = *stablep;int use_wgather; +loff_t pos = offset; dentry = file->f_path.dentry; inode = dentry->d_inode;
@@ -1025,7 +1026,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,/* Write the data. */ oldfs =get_fs ();set_fs (KERNEL_DS ); - host_err =vfs_writev (file, (struct iovec __user *)vec, vlen, &offset); + host_err =vfs_writev (file, (struct iovec __user *)vec, vlen, &pos);set_fs (oldfs);if (host_err <0 ) goto out_nfserr;
Signature · 1 line
1.8.1.3
Quoted 3 lines · Kent Overstreet
vfs_writev()updates the offset argument - but the code then passes the offset tovfs_fsync_range(). Since offset now points to the offset after what was just written, this is probably not what was intended
Agreed, the original code does look fishy and this fix right to me.
- z
Quoted 3 lines · Kent Overstreet
vfs_writev()updates the offset argument - but the code then passes the offset tovfs_fsync_range(). Since offset now points to the offset after what was just written, this is probably not what was intended
Whoops--thanks! Looks like this was introduced by my face15025ffdf664de95e86ae831544154d26c9c "nfsd: use vfs_fsync_range(), not O_SYNC, for stable writes", in 3.8.
I'll queue up for 3.9 and stable.
--b.
Quoted 34 lines
Signed-off-by Kent Overstreet <[email protected]>Cc "J. Bruce Fields" <[email protected]>Cc Al Viro <[email protected]>Cc "Eric W. Biederman" <[email protected]>Cc Zach Brown <[email protected]>--- fs/nfsd/vfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)fs/nfsd/vfs.c +2
-1@@ -1013,6 +1013,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,int host_err;int stable = *stablep;int use_wgather; +loff_t pos = offset; dentry = file->f_path.dentry; inode = dentry->d_inode;@@ -1025,7 +1026,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,/* Write the data. */ oldfs =get_fs ();set_fs (KERNEL_DS ); - host_err =vfs_writev (file, (struct iovec __user *)vec, vlen, &offset); + host_err =vfs_writev (file, (struct iovec __user *)vec, vlen, &pos);set_fs (oldfs);if (host_err <0 ) goto out_nfserr;Signature · 1 line
1.8.1.3
Quoted 10 lines · J. Bruce Fields
Quoted 3 lines · Kent Overstreet
vfs_writev()updates the offset argument - but the code then passes the offset tovfs_fsync_range(). Since offset now points to the offset after what was just written, this is probably not what was intendedWhoops--thanks! Looks like this was introduced by my
face15025ffdf664de95e86ae831544154d26c9c"nfsd: usevfs_fsync_range(), notO_SYNC, for stable writes", in 3.8.I'll queue up for 3.9 and stable.
(By the way, out of curiosity: how did you stumble across this?)
--b.
Quoted 37 lines
--b.
Quoted 34 lines
Signed-off-by Kent Overstreet <[email protected]>Cc "J. Bruce Fields" <[email protected]>Cc Al Viro <[email protected]>Cc "Eric W. Biederman" <[email protected]>Cc Zach Brown <[email protected]>--- fs/nfsd/vfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)fs/nfsd/vfs.c +2
-1@@ -1013,6 +1013,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,int host_err;int stable = *stablep;int use_wgather; +loff_t pos = offset; dentry = file->f_path.dentry; inode = dentry->d_inode;@@ -1025,7 +1026,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,/* Write the data. */ oldfs =get_fs ();set_fs (KERNEL_DS ); - host_err =vfs_writev (file, (struct iovec __user *)vec, vlen, &offset); + host_err =vfs_writev (file, (struct iovec __user *)vec, vlen, &pos);set_fs (oldfs);if (host_err <0 ) goto out_nfserr;Signature · 1 line
1.8.1.3
Quoted 6 lines · J. Bruce Fields
Quoted 5 lines · J. Bruce Fields
Quoted 3 lines · Kent Overstreet
vfs_writev()updates the offset argument - but the code then passes the offset tovfs_fsync_range(). Since offset now points to the offset after what was just written, this is probably not what was intended
Quoted 7 lines
Quoted 5 lines
Whoops--thanks! Looks like this was introduced by my
face15025ffdf664de95e86ae831544154d26c9c"nfsd: usevfs_fsync_range(), notO_SYNC, for stable writes", in 3.8.I'll queue up for 3.9 and stable.
(By the way, out of curiosity: how did you stumble across this?)
Just reading code - I've been trying to figure out how to improve the way *pos pointers are passed around everywhere and I was looking at all the users of various vfs code.
Quoted 39 lines
--b.
Quoted 37 lines
--b.
Quoted 34 lines
Signed-off-by Kent Overstreet <[email protected]>Cc "J. Bruce Fields" <[email protected]>Cc Al Viro <[email protected]>Cc "Eric W. Biederman" <[email protected]>Cc Zach Brown <[email protected]>--- fs/nfsd/vfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)fs/nfsd/vfs.c +2
-1@@ -1013,6 +1013,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,int host_err;int stable = *stablep;int use_wgather; +loff_t pos = offset; dentry = file->f_path.dentry; inode = dentry->d_inode;@@ -1025,7 +1026,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,/* Write the data. */ oldfs =get_fs ();set_fs (KERNEL_DS ); - host_err =vfs_writev (file, (struct iovec __user *)vec, vlen, &offset); + host_err =vfs_writev (file, (struct iovec __user *)vec, vlen, &pos);set_fs (oldfs);if (host_err <0 ) goto out_nfserr;Signature · 1 line
1.8.1.3