Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c90c68a authored by Russ Ross's avatar Russ Ross Committed by Linus Torvalds
Browse files

[PATCH] 9p: fix marshalling bug in tcreate with empty extension field 



Signed-off-by: default avatarRuss Ross <russross@gmail.com>
Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0e31f51d

fs/9p/conv.c

+4 −2
Original line number Diff line number Diff line
@@ -673,8 +673,10 @@ struct v9fs_fcall *v9fs_create_tcreate(u32 fid, char *name, u32 perm, u8 mode, 
	struct cbuf *bufp = &buffer;



	size = 4 + 2 + strlen(name) + 4 + 1;	/* fid[4] name[s] perm[4] mode[1] */

	if (extended && extension!=NULL)

		size += 2 + strlen(extension);	/* extension[s] */

	if (extended) {

		size += 2 +			/* extension[s] */

		    (extension == NULL ? 0 : strlen(extension));

	}



	fc = v9fs_create_common(bufp, size, TCREATE);

	if (IS_ERR(fc))