lkml.org 
[lkml]   [2019]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH v2 2/2] mmc: cqhci: Fix a tiny potential memory leak on error condition
    From
    Date
    On 25/02/19 9:22 PM, Alamy Liu wrote:
    > Free up the allocated memory in the case of error return
    >
    > --- code study ---
    > The value of mmc_host->cqe_enabled stays 'false'.
    > Thus, cqhci_disable (mmc_cqe_ops->cqe_disable) won't be called to
    > free the memory.
    > Also, cqhci_disable() seems to be designed to disable and free
    > all resources, not suitable to handle this corner case.
    >
    > Fixes: a4080225f51d ("mmc: cqhci: support for command queue enabled host")
    > Signed-off-by: Alamy Liu <alamy.liu@gmail.com>

    Acked-by: Adrian Hunter <adrian.hunter@intel.com>

    > ---
    > drivers/mmc/host/cqhci.c | 11 ++++++++++-
    > 1 file changed, 10 insertions(+), 1 deletion(-)
    >
    > diff --git a/drivers/mmc/host/cqhci.c b/drivers/mmc/host/cqhci.c
    > index 974997b6cb..795893ba47 100644
    > --- a/drivers/mmc/host/cqhci.c
    > +++ b/drivers/mmc/host/cqhci.c
    > @@ -218,12 +218,21 @@ static int cqhci_host_alloc_tdl(struct cqhci_host *cq_host)
    > cq_host->desc_size,
    > &cq_host->desc_dma_base,
    > GFP_KERNEL);
    > + if (!cq_host->desc_base)
    > + return -ENOMEM;
    > +
    > cq_host->trans_desc_base = dmam_alloc_coherent(mmc_dev(cq_host->mmc),
    > cq_host->data_size,
    > &cq_host->trans_desc_dma_base,
    > GFP_KERNEL);
    > - if (!cq_host->desc_base || !cq_host->trans_desc_base)
    > + if (!cq_host->trans_desc_base) {
    > + dmam_free_coherent(mmc_dev(cq_host->mmc), cq_host->desc_size,
    > + cq_host->desc_base,
    > + cq_host->desc_dma_base);
    > + cq_host->desc_base = NULL;
    > + cq_host->desc_dma_base = 0;
    > return -ENOMEM;
    > + }
    >
    > pr_debug("%s: cqhci: desc-base: 0x%p trans-base: 0x%p\n desc_dma 0x%llx trans_dma: 0x%llx\n",
    > mmc_hostname(cq_host->mmc), cq_host->desc_base, cq_host->trans_desc_base,
    >

    \
     
     \ /
      Last update: 2019-02-27 14:47    [W:4.026 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site