leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] v9fs: v9fs_put_str fix

Browse Source 
v9fs_put_str used to store pointer to the source string, instead of the
cbuf copy.  This patch corrects it.

Signed-off-by: Latchesar Ionkov <lucho@ionkov.net>
Cc: Eric Van Hensbergen <ericvh@ericvh.myip.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Latchesar Ionkov 2006-02-03 03:04:18 -08:00 committed by Linus Torvalds
parent 93c615feff
commit 05818a004a
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fs/9p/conv.c
View File

@ -116,13 +116,19 @@ static void buf_put_int64(struct cbuf *buf, u64 val)
} }
} }
static void buf_put_stringn(struct cbuf *buf, const char *s, u16 slen) static char *buf_put_stringn(struct cbuf *buf, const char *s, u16 slen)
{ {
char *ret;
ret = NULL;
if (buf_check_size(buf, slen + 2)) { if (buf_check_size(buf, slen + 2)) {
buf_put_int16(buf, slen); buf_put_int16(buf, slen);
ret = buf->p;
memcpy(buf->p, s, slen); memcpy(buf->p, s, slen);
buf->p += slen; buf->p += slen;
} }
return ret;
} }
static inline void buf_put_string(struct cbuf *buf, const char *s) static inline void buf_put_string(struct cbuf *buf, const char *s)
@ -430,15 +436,19 @@ static inline void v9fs_put_int64(struct cbuf *bufp, u64 val, u64 * p)
static void static void
v9fs_put_str(struct cbuf *bufp, char *data, struct v9fs_str *str) v9fs_put_str(struct cbuf *bufp, char *data, struct v9fs_str *str)
{ {
if (data) { int len;
str->len = strlen(data); char *s;
str->str = bufp->p;
} else {
str->len = 0;
str->str = NULL;
}
buf_put_stringn(bufp, data, str->len); if (data)
len = strlen(data);
else
len = 0;
s = buf_put_stringn(bufp, data, len);
if (str) {
str->len = len;
str->str = s;
}
} }
static int static int