aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-12 18:00:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-12 18:00:09 -0700
commit446cc6345d3de6571bdd0840f48aca441488a28d (patch)
treed955f58d6895088dad9a45efcc78302d1d51511a
parentMerge branch 'for-2639-rc7/i2c-fixes' of git://git.fluff.org/bjdooks/linux (diff)
parentnet/9p/protocol.c: Fix a memory leak (diff)
downloadlinux-dev-446cc6345d3de6571bdd0840f48aca441488a28d.tar.xz
linux-dev-446cc6345d3de6571bdd0840f48aca441488a28d.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: net/9p/protocol.c: Fix a memory leak
-rw-r--r--net/9p/protocol.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/9p/protocol.c b/net/9p/protocol.c
index b58a501cf3d1..a873277cb996 100644
--- a/net/9p/protocol.c
+++ b/net/9p/protocol.c
@@ -674,6 +674,7 @@ int p9dirent_read(char *buf, int len, struct p9_dirent *dirent,
}
strcpy(dirent->d_name, nameptr);
+ kfree(nameptr);
out:
return fake_pdu.offset;