summaryrefslogtreecommitdiff
path: root/net/9p/conv.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-23 21:38:21 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-23 21:38:21 -0700
commit0542170dec523d50e8bed5515e2f7314e738c8d8 (patch)
tree4154d3a3a511e1d0cf9b80eaaef5d02f00fd3a04 /net/9p/conv.c
parent6dc2c1b7798ef645213afc82f6d5eac3d61bc18b (diff)
parent02881d94780faa86e32952e46381f7cd4c78d5ac (diff)
downloadlinux-0542170dec523d50e8bed5515e2f7314e738c8d8.tar.gz
linux-0542170dec523d50e8bed5515e2f7314e738c8d8.tar.bz2
linux-0542170dec523d50e8bed5515e2f7314e738c8d8.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: 9p: fix bad error path in conversion routines 9p: remove deprecated v9fs_fid_lookup_remove() 9p: update maintainers and documentation 9p: fix use after free
Diffstat (limited to 'net/9p/conv.c')
-rw-r--r--net/9p/conv.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/9p/conv.c b/net/9p/conv.c
index f2a041cb508a..d979d958ea19 100644
--- a/net/9p/conv.c
+++ b/net/9p/conv.c
@@ -796,6 +796,7 @@ struct p9_fcall *p9_create_twrite_u(u32 fid, u64 offset, u32 count,
if (err) {
kfree(fc);
fc = ERR_PTR(err);
+ goto error;
}
if (buf_check_overflow(bufp)) {