Commit d612d7b4 authored Feb 25, 2019 by Alamy Liu Committed by Greg Kroah-Hartman Mar 05, 2019

mmc: cqhci: Fix a tiny potential memory leak on error condition



commit d07e9fadf3a6b466ca3ae90fa4859089ff20530f upstream.

Free up the allocated memory in the case of error return

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: a4080225 ("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>
Cc: stable@vger.kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent e446ae40

drivers/mmc/host/cqhci.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -217,12 +217,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,