The patch titled
9p: fix marshalling bug in tcreate with empty extension field
has been removed from the -mm tree. Its filename is
9p-fix-marshalling-bug-in-tcreate-with-empty-extension-field.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: 9p: fix marshalling bug in tcreate with empty extension field
From: Russ Ross <russross@xxxxxxxxx>
Signed-off-by: Russ Ross <russross@xxxxxxxxx>
Signed-off-by: Eric Van Hensbergen <ericvh@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/9p/conv.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff -puN fs/9p/conv.c~9p-fix-marshalling-bug-in-tcreate-with-empty-extension-field fs/9p/conv.c
--- a/fs/9p/conv.c~9p-fix-marshalling-bug-in-tcreate-with-empty-extension-field
+++ a/fs/9p/conv.c
@@ -673,8 +673,10 @@ struct v9fs_fcall *v9fs_create_tcreate(u
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))
_
Patches currently in -mm which might be from russross@xxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
