| commit | 446cc6345d3de6571bdd0840f48aca441488a28d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 12 18:00:09 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 12 18:00:09 2011 -0700 |
| tree | d955f58d6895088dad9a45efcc78302d1d51511a | |
| parent | 9bbd055808248a7adc78161472d3301285252361 [diff] | |
| parent | 1b0bcbcf62884959fa7214eb16c44cff445691c6 [diff] |
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
diff --git a/net/9p/protocol.c b/net/9p/protocol.c index b58a501..a873277 100644 --- a/net/9p/protocol.c +++ b/net/9p/protocol.c
@@ -674,6 +674,7 @@ } strcpy(dirent->d_name, nameptr); + kfree(nameptr); out: return fake_pdu.offset;