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

[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
...@@ -673,8 +673,10 @@ struct v9fs_fcall *v9fs_create_tcreate(u32 fid, char *name, u32 perm, u8 mode, ...@@ -673,8 +673,10 @@ struct v9fs_fcall *v9fs_create_tcreate(u32 fid, char *name, u32 perm, u8 mode,
struct cbuf *bufp = &buffer; struct cbuf *bufp = &buffer;
size = 4 + 2 + strlen(name) + 4 + 1; /* fid[4] name[s] perm[4] mode[1] */ size = 4 + 2 + strlen(name) + 4 + 1; /* fid[4] name[s] perm[4] mode[1] */
if (extended && extension!=NULL) if (extended) {
size += 2 + strlen(extension); /* extension[s] */ size += 2 + /* extension[s] */
(extension == NULL ? 0 : strlen(extension));
}
fc = v9fs_create_common(bufp, size, TCREATE); fc = v9fs_create_common(bufp, size, TCREATE);
if (IS_ERR(fc)) if (IS_ERR(fc))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment