aboutsummaryrefslogtreecommitdiffstats
path: root/net/9p
diff options
context:
space:
mode:
authorSimon Derr <simon.derr@bull.net>2013-06-21 15:32:40 +0200
committerEric Van Hensbergen <ericvh@gmail.com>2013-07-07 22:02:29 -0500
commitb530e252e291c27fdcb1b73c72ad17f75c8bdba6 (patch)
tree0f9c42053871a3b5036d6cc39b7c3847ac539288 /net/9p
parentfd453d0ed6c1dacef8eff466df473d62d63db1e9 (diff)
9P/RDMA: Do not free req->rc in error handling in rdma_request()
rdma_request() should never be in charge of freeing rc. When an error occurs: * Either the rc buffer has been recv_post()'ed. then kfree()'ing it certainly is a bad idea. * Or is has not, and in that case req->rc still points to it, hence it needs not be freed. Signed-off-by: Simon Derr <simon.derr@bull.net> Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Diffstat (limited to 'net/9p')
-rw-r--r--net/9p/trans_rdma.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c
index ad8dc331574b..1bd4c7150114 100644
--- a/net/9p/trans_rdma.c
+++ b/net/9p/trans_rdma.c
@@ -447,7 +447,7 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req)
err = post_recv(client, rpl_context);
if (err) {
p9_debug(P9_DEBUG_FCALL, "POST RECV failed\n");
- goto err_free1;
+ goto err_free;
}
/* remove posted receive buffer from request structure */
@@ -457,7 +457,7 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req)
c = kmalloc(sizeof *c, GFP_NOFS);
if (!c) {
err = -ENOMEM;
- goto err_free1;
+ goto err_free;
}
c->req = req;
@@ -486,13 +486,10 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req)
error:
kfree(c);
- kfree(rpl_context->rc);
kfree(rpl_context);
p9_debug(P9_DEBUG_ERROR, "EIO\n");
return -EIO;
- err_free1:
- kfree(rpl_context->rc);
- err_free2:
+ err_free:
kfree(rpl_context);
err_close:
spin_lock_irqsave(&rdma->req_lock, flags);

Privacy Policy