evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

9P/RDMA: Do not free req->rc in error handling in rdma_request()

Browse source 
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>
This commit is contained in:
Simon Derr 2013-06-21 15:32:40 +02:00 • committed by Eric Van Hensbergen
parent fd453d0ed6
commit b530e252e2
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
net/9p/trans_rdma.c
View file

@ -447,7 +447,7 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req)
err = post_recv(client, rpl_context); err = post_recv(client, rpl_context);
if (err) { if (err) {
p9_debug(P9_DEBUG_FCALL, "POST RECV failed\n"); p9_debug(P9_DEBUG_FCALL, "POST RECV failed\n");
goto err_free1; goto err_free;
} }
/* remove posted receive buffer from request structure */ /* 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); c = kmalloc(sizeof *c, GFP_NOFS);
if (!c) { if (!c) {
err = -ENOMEM; err = -ENOMEM;
goto err_free1; goto err_free;
} }
c->req = req; c->req = req;
@ -486,13 +486,10 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req)
error: error:
kfree(c); kfree(c);
kfree(rpl_context->rc);
kfree(rpl_context); kfree(rpl_context);
p9_debug(P9_DEBUG_ERROR, "EIO\n"); p9_debug(P9_DEBUG_ERROR, "EIO\n");
return -EIO; return -EIO;
err_free1: err_free:
kfree(rpl_context->rc);
err_free2:
kfree(rpl_context); kfree(rpl_context);
err_close: err_close:
spin_lock_irqsave(&rdma->req_lock, flags); spin_lock_irqsave(&rdma->req_lock, flags);