dma-buf: fix reference count leak in dma_buf_poll_add_cb()
Subsystems (3)
PATCH 1/1 dma-buf: fix reference count leak in dma_buf_poll_add_cb()
Call dma_fence_put(fence) if dma_fence_add_callback() fails.
---
From code review, not from testing. Please review carefully.
drivers/dma-buf/dma-buf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma-buf/dma-buf.c +1 -1
@@ -301,9 +301,9 @@ static bool dma_buf_poll_add_cb(struct dma_resv *resv, bool write, fence) {dma_fence_get (fence); r =dma_fence_add_callback (fence, &dcb->cb, dma_buf_poll_cb); +dma_fence_put (fence);if (!r)return true; -dma_fence_put (fence); }return false;
Signature · 1 line
2.51.0
Christian König
maintainerQuoted 1 line · Dan Carpenter
Call
dma_fence_put(fence)ifdma_fence_add_callback()fails.
Well that change is obviously incorrect.
When dma_fence_add_callback() fails we already call dma_fence_put() and drop the reference.
When the dma_fence_add_callback() call succeeds the callback will drop the reference.
The problem here is that the return code of dma_fence_add_callback() is an integer error code instead of a bool and basically has the reverse meaning than what people usually expect.
I have it on my TODO list for years to fix that, but never found the time to actually do it. If anybody wants to volunteer then please go ahead.
Regards,
Christian.
Quoted 24 lines
Fixes 6b51b02a3a0a ("dma-buf: fix and rework dma_buf_poll v7")Signed-off-by Dan Carpenter <[email protected]>---
From code review, not from testing. Please review carefully.drivers/dma-buf/dma-buf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/dma-buf/dma-buf.c +1
-1@@ -301,9 +301,9 @@ static bool dma_buf_poll_add_cb(struct dma_resv *resv, bool write, fence) {dma_fence_get (fence); r =dma_fence_add_callback (fence, &dcb->cb, dma_buf_poll_cb); +dma_fence_put (fence);if (!r)return true; -dma_fence_put (fence); }return false;
Quoted 11 lines · Christian König
Quoted 1 line · Dan Carpenter
Call
dma_fence_put(fence)ifdma_fence_add_callback()fails.Well that change is obviously incorrect.
When
dma_fence_add_callback()fails we already calldma_fence_put()and drop the reference.When the
dma_fence_add_callback()call succeeds the callback will drop the reference.The problem here is that the return code of
dma_fence_add_callback()is an integer error code instead of a bool and basically has the reverse meaning than what people usually expect.
Ah, yes. You're exactly correct of course. Sorry about that.
regards,
dan carpenter