| Message ID | 20211206104315.12516-1-amhamza.mgc@gmail.com |
|---|---|
| State | Accepted |
| Commit | 8403fdd775858a7bf04868d43daea0acbe49ddfc |
| Headers | show |
| Series | [v3] media: venus: vdec: fixed possible memory leak issue | expand |
Quoting Ameer Hamza (2021-12-06 10:43:15) > The venus_helper_alloc_dpb_bufs() implementation allows an early return > on an error path when checking the id from ida_alloc_min() which would > not release the earlier buffer allocation. > > Move the direct kfree() from the error checking of dma_alloc_attrs() to > the common fail path to ensure that allocations are released on all > error paths in this function. > > Addresses-Coverity: 1494120 ("Resource leak") > > Fixes: 40d87aafee29 ("media: venus: vdec: decoded picture buffer handling during reconfig sequence") > No need for blank lines between those tags, and when someone provides a Reviewed-by tag, you can collect it into your patch for future versions unless you feel you've modified the patch so much that it doesn't apply anymore. So this can still be added (no need to repost to add to this patch, I believe the integration scripts likely pick up tags added to a patch, but won't pick up ones added to previous versions). Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > Signed-off-by: Ameer Hamza <amhamza.mgc@gmail.com> > > --- > Changes in v3: > Updated description and added fix tag > --- > drivers/media/platform/qcom/venus/helpers.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c > index 84c3a511ec31..0bca95d01650 100644 > --- a/drivers/media/platform/qcom/venus/helpers.c > +++ b/drivers/media/platform/qcom/venus/helpers.c > @@ -189,7 +189,6 @@ int venus_helper_alloc_dpb_bufs(struct venus_inst *inst) > buf->va = dma_alloc_attrs(dev, buf->size, &buf->da, GFP_KERNEL, > buf->attrs); > if (!buf->va) { > - kfree(buf); > ret = -ENOMEM; > goto fail; > } > @@ -209,6 +208,7 @@ int venus_helper_alloc_dpb_bufs(struct venus_inst *inst) > return 0; > > fail: > + kfree(buf); > venus_helper_free_dpb_bufs(inst); > return ret; > } > -- > 2.25.1 >
diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c index 84c3a511ec31..0bca95d01650 100644 --- a/drivers/media/platform/qcom/venus/helpers.c +++ b/drivers/media/platform/qcom/venus/helpers.c @@ -189,7 +189,6 @@ int venus_helper_alloc_dpb_bufs(struct venus_inst *inst) buf->va = dma_alloc_attrs(dev, buf->size, &buf->da, GFP_KERNEL, buf->attrs); if (!buf->va) { - kfree(buf); ret = -ENOMEM; goto fail; } @@ -209,6 +208,7 @@ int venus_helper_alloc_dpb_bufs(struct venus_inst *inst) return 0; fail: + kfree(buf); venus_helper_free_dpb_bufs(inst); return ret; }
The venus_helper_alloc_dpb_bufs() implementation allows an early return on an error path when checking the id from ida_alloc_min() which would not release the earlier buffer allocation. Move the direct kfree() from the error checking of dma_alloc_attrs() to the common fail path to ensure that allocations are released on all error paths in this function. Addresses-Coverity: 1494120 ("Resource leak") Fixes: 40d87aafee29 ("media: venus: vdec: decoded picture buffer handling during reconfig sequence") Signed-off-by: Ameer Hamza <amhamza.mgc@gmail.com> --- Changes in v3: Updated description and added fix tag --- drivers/media/platform/qcom/venus/helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)