LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] SUNRPC: Remove resource leak in svc_rdma_send_error()
@ 2011-01-22 21:40 Jesper Juhl
  2011-03-17 18:37 ` J. Bruce Fields
  0 siblings, 1 reply; 3+ messages in thread
From: Jesper Juhl @ 2011-01-22 21:40 UTC (permalink / raw)
  To: linux-nfs
  Cc: netdev, linux-kernel, Pavel Emelyanov, Chuck Lever, Tejun Heo,
	Tom Tucker, David S. Miller, Trond Myklebust, Neil Brown,
	J. Bruce Fields

We leak the memory allocated to 'ctxt' when we return after 
'ib_dma_mapping_error()' returns !=0.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
---
 svc_rdma_transport.c |    1 +
 1 file changed, 1 insertion(+)

  compile tested only

diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
index 9df1ead..1a10dcd 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -1335,6 +1335,7 @@ void svc_rdma_send_error(struct svcxprt_rdma *xprt, struct rpcrdma_msg *rmsgp,
 					    p, 0, length, DMA_FROM_DEVICE);
 	if (ib_dma_mapping_error(xprt->sc_cm_id->device, ctxt->sge[0].addr)) {
 		put_page(p);
+		svc_rdma_put_context(ctxt, 1);
 		return;
 	}
 	atomic_inc(&xprt->sc_dma_used);


-- 
Jesper Juhl <jj@chaosbits.net>            http://www.chaosbits.net/
Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please.


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] SUNRPC: Remove resource leak in svc_rdma_send_error()
  2011-01-22 21:40 [PATCH] SUNRPC: Remove resource leak in svc_rdma_send_error() Jesper Juhl
@ 2011-03-17 18:37 ` J. Bruce Fields
  2011-03-17 18:54   ` Tom Tucker
  0 siblings, 1 reply; 3+ messages in thread
From: J. Bruce Fields @ 2011-03-17 18:37 UTC (permalink / raw)
  To: Jesper Juhl
  Cc: linux-nfs, netdev, linux-kernel, Pavel Emelyanov, Chuck Lever,
	Tejun Heo, Tom Tucker, David S. Miller, Trond Myklebust,
	Neil Brown

On Sat, Jan 22, 2011 at 10:40:20PM +0100, Jesper Juhl wrote:
> We leak the memory allocated to 'ctxt' when we return after 
> 'ib_dma_mapping_error()' returns !=0.
> 
> Signed-off-by: Jesper Juhl <jj@chaosbits.net>

I don't know this code, but I can't see how that could be wrong....
Applying unless Tom tells me otherwise.

--b.

> ---
>  svc_rdma_transport.c |    1 +
>  1 file changed, 1 insertion(+)
> 
>   compile tested only
> 
> diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
> index 9df1ead..1a10dcd 100644
> --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
> +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
> @@ -1335,6 +1335,7 @@ void svc_rdma_send_error(struct svcxprt_rdma *xprt, struct rpcrdma_msg *rmsgp,
>  					    p, 0, length, DMA_FROM_DEVICE);
>  	if (ib_dma_mapping_error(xprt->sc_cm_id->device, ctxt->sge[0].addr)) {
>  		put_page(p);
> +		svc_rdma_put_context(ctxt, 1);
>  		return;
>  	}
>  	atomic_inc(&xprt->sc_dma_used);
> 
> 
> -- 
> Jesper Juhl <jj@chaosbits.net>            http://www.chaosbits.net/
> Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
> Plain text mails only, please.
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] SUNRPC: Remove resource leak in svc_rdma_send_error()
  2011-03-17 18:37 ` J. Bruce Fields
@ 2011-03-17 18:54   ` Tom Tucker
  0 siblings, 0 replies; 3+ messages in thread
From: Tom Tucker @ 2011-03-17 18:54 UTC (permalink / raw)
  To: J. Bruce Fields
  Cc: Jesper Juhl, linux-nfs, netdev, linux-kernel, Pavel Emelyanov,
	Chuck Lever, Tejun Heo, David S. Miller, Trond Myklebust,
	Neil Brown

Hi Bruce,

I believe this fix is correct.

Tom

On 3/17/11 12:37 PM, J. Bruce Fields wrote:
> On Sat, Jan 22, 2011 at 10:40:20PM +0100, Jesper Juhl wrote:
>> We leak the memory allocated to 'ctxt' when we return after
>> 'ib_dma_mapping_error()' returns !=0.
>>
>> Signed-off-by: Jesper Juhl<jj@chaosbits.net>
> I don't know this code, but I can't see how that could be wrong....
> Applying unless Tom tells me otherwise.
>
> --b.
>
>> ---
>>   svc_rdma_transport.c |    1 +
>>   1 file changed, 1 insertion(+)
>>
>>    compile tested only
>>
>> diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
>> index 9df1ead..1a10dcd 100644
>> --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
>> +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
>> @@ -1335,6 +1335,7 @@ void svc_rdma_send_error(struct svcxprt_rdma *xprt, struct rpcrdma_msg *rmsgp,
>>   					    p, 0, length, DMA_FROM_DEVICE);
>>   	if (ib_dma_mapping_error(xprt->sc_cm_id->device, ctxt->sge[0].addr)) {
>>   		put_page(p);
>> +		svc_rdma_put_context(ctxt, 1);
>>   		return;
>>   	}
>>   	atomic_inc(&xprt->sc_dma_used);
>>
>>
>> -- 
>> Jesper Juhl<jj@chaosbits.net>             http://www.chaosbits.net/
>> Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
>> Plain text mails only, please.
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-03-17 18:54 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-22 21:40 [PATCH] SUNRPC: Remove resource leak in svc_rdma_send_error() Jesper Juhl
2011-03-17 18:37 ` J. Bruce Fields
2011-03-17 18:54   ` Tom Tucker

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).