aboutsummaryrefslogtreecommitdiffstats
path: root/net/9p
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2008-09-24 17:22:22 -0400
committerEric Van Hensbergen <ericvh@ericvh-desktop.austin.ibm.com>2008-09-24 17:22:22 -0400
commit620678244bc7b83287e2e283ed4fe6b959e94b7d (patch)
tree1d79a263ffd1f406cd3b9fb7ff79b126bc2236d6 /net/9p
parent206ca50de77033c6cc17d0e14fbb12d119a67b01 (diff)
9p: introduce missing kfree
Error handling code following a kmalloc should free the allocated data. The semantic match that finds the problem is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @r exists@ local idexpression x; statement S; expression E; identifier f,l; position p1,p2; expression *ptr != NULL; @@ ( if ((x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...)) == NULL) S | x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...); ... if (x == NULL) S ) <... when != x when != if (...) { <+...x...+> } x->f = E ...> ( return \(0\|<+...x...+>\|ptr\); | return@p2 ...; ) @script:python@ p1 << r.p1; p2 << r.p2; @@ print "* file: %s kmalloc %s return %s" % (p1[0].file,p1[0].line,p2[0].line) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'net/9p')
-rw-r--r--net/9p/trans_fd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
index 0b4eb5f78356..d652baf5ff91 100644
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
@@ -870,8 +870,10 @@ static struct p9_req *p9_send_request(struct p9_conn *m,
870 else 870 else
871 n = p9_mux_get_tag(m); 871 n = p9_mux_get_tag(m);
872 872
873 if (n < 0) 873 if (n < 0) {
874 kfree(req);
874 return ERR_PTR(-ENOMEM); 875 return ERR_PTR(-ENOMEM);
876 }
875 877
876 p9_set_tag(tc, n); 878 p9_set_tag(tc, n);
877 879