Commit e49dbbf3 authored Mar 22, 2013 by Kent Overstreet Committed by J. Bruce Fields Mar 22, 2013

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

Introduced by face1502 "nfsd: use
vfs_fsync_range(), not O_SYNC, for stable writes".

Signed-off-by: Kent Overstreet <koverstreet@google.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: stable@vger.kernel.org
Reviewed-by: Zach Brown <zab@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

parent ac534ff2

fs/nfsd/vfs.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message