Commit 2e4bef41 authored by Eric Van Hensbergen's avatar Eric Van Hensbergen Committed by Eric Van Hensbergen
Browse files

9p: fix O_APPEND in legacy mode 



The legacy protocol's open operation doesn't handle an append operation
(it is expected that the client take care of it).  We were incorrectly
passing the extended protocol's flag through even in legacy mode.  This
was reported in bugzilla report #10689.  This patch fixes the problem
by disallowing extended protocol open modes from being passed in legacy
mode and implemented append functionality on the client side by adding
a seek after the open.

Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
parent c461a973

fs/9p/v9fs_vfs.h

+1 −1
Original line number Diff line number Diff line
@@ -51,4 +51,4 @@ int v9fs_dir_release(struct inode *inode, struct file *filp); 
int v9fs_file_open(struct inode *inode, struct file *file);

void v9fs_inode2stat(struct inode *inode, struct p9_stat *stat);

void v9fs_dentry_release(struct dentry *);

int v9fs_uflags2omode(int uflags);
 
int v9fs_uflags2omode(int uflags, int extended);

fs/9p/vfs_file.c

+3 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ int v9fs_file_open(struct inode *inode, struct file *file) 


	P9_DPRINTK(P9_DEBUG_VFS, "inode: %p file: %p \n", inode, file);

	v9ses = v9fs_inode2v9ses(inode);

	omode = v9fs_uflags2omode(file->f_flags);

	omode = v9fs_uflags2omode(file->f_flags, v9fs_extended(v9ses));

	fid = file->private_data;

	if (!fid) {

		fid = v9fs_fid_clone(file->f_path.dentry);
@@ -75,6 +75,8 @@ int v9fs_file_open(struct inode *inode, struct file *file) 
			inode->i_size = 0;

			inode->i_blocks = 0;

		}

		if ((file->f_flags & O_APPEND) && (!v9fs_extended(v9ses)))

			generic_file_llseek(file, 0, SEEK_END);

	}



	file->private_data = fid;

fs/9p/vfs_inode.c

+10 −8
Original line number Diff line number Diff line
@@ -132,10 +132,10 @@ static int p9mode2unixmode(struct v9fs_session_info *v9ses, int mode) 
/**

 * v9fs_uflags2omode- convert posix open flags to plan 9 mode bits

 * @uflags: flags to convert

 *

 * @extended: if .u extensions are active

 */



int v9fs_uflags2omode(int uflags)

int v9fs_uflags2omode(int uflags, int extended)

{

	int ret;
@@ -155,14 +155,16 @@ int v9fs_uflags2omode(int uflags) 
		break;

	}



	if (uflags & O_EXCL)

		ret |= P9_OEXCL;



	if (uflags & O_TRUNC)

		ret |= P9_OTRUNC;



	if (extended) {

		if (uflags & O_EXCL)

			ret |= P9_OEXCL;



		if (uflags & O_APPEND)

			ret |= P9_OAPPEND;

	}



	return ret;

}
@@ -506,7 +508,7 @@ v9fs_vfs_create(struct inode *dir, struct dentry *dentry, int mode, 
		flags = O_RDWR;



	fid = v9fs_create(v9ses, dir, dentry, NULL, perm,

						v9fs_uflags2omode(flags));

				v9fs_uflags2omode(flags, v9fs_extended(v9ses)));

	if (IS_ERR(fid)) {

		err = PTR_ERR(fid);

		fid = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE