public inbox for linux-mmc@vger.kernel.org
 help / color / mirror / Atom feed
From: Alamy Liu <alamy.liu@gmail.com>
To: Venkat Gopalakrishnan <venkatg@codeaurora.org>
Cc: Ulf Hansson <ulf.hansson@linaro.org>,
	"open list:MULTIMEDIA CARD MMC,
	SECURE DIGITAL SD AND..." <linux-mmc@vger.kernel.org>,
	open list <linux-kernel@vger.kernel.org>
Subject: [PATCH] mmc: cqhci: Fix a tiny potential memory leak on error condition
Date: Tue, 15 Jan 2019 16:24:38 -0800	[thread overview]
Message-ID: <20190116002440.1678-1-alamy.liu@gmail.com> (raw)

In the error case:
   either cq_host->desc_base
       or cq_host->trans_desc_base
might have been granted memory successfully.

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() is designed to disable and free all resources,
not suitable to handle this corner case.

Signed-off-by: Alamy Liu <alamy.liu@gmail.com>
---
 drivers/mmc/host/cqhci.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/cqhci.c b/drivers/mmc/host/cqhci.c
index 974997b6cb..58ad8cd613 100644
--- a/drivers/mmc/host/cqhci.c
+++ b/drivers/mmc/host/cqhci.c
@@ -223,7 +223,7 @@ static int cqhci_host_alloc_tdl(struct cqhci_host *cq_host)
 					      &cq_host->trans_desc_dma_base,
 					      GFP_KERNEL);
 	if (!cq_host->desc_base || !cq_host->trans_desc_base)
-		return -ENOMEM;
+		goto err_free_dma;
 
 	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,
@@ -234,6 +234,24 @@ static int cqhci_host_alloc_tdl(struct cqhci_host *cq_host)
 		setup_trans_desc(cq_host, i);
 
 	return 0;
+
+err_free_dma:
+	if (cq_host->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;
+	}
+	if (cq_host->trans_desc_base) {
+		dmam_free_coherent(mmc_dev(cq_host->mmc), cq_host->data_size,
+				   cq_host->trans_desc_base,
+				   cq_host->trans_desc_dma_base);
+		cq_host->trans_desc_base = NULL;
+		cq_host->trans_desc_dma_base = 0;
+	}
+
+	return -ENOMEM;
 }
 
 static void __cqhci_enable(struct cqhci_host *cq_host)
-- 
2.17.1

             reply	other threads:[~2019-01-16  0:24 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-16  0:24 Alamy Liu [this message]
2019-01-31 10:10 ` [PATCH] mmc: cqhci: Fix a tiny potential memory leak on error condition Adrian Hunter
2019-01-31 10:12   ` Adrian Hunter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190116002440.1678-1-alamy.liu@gmail.com \
    --to=alamy.liu@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=ulf.hansson@linaro.org \
    --cc=venkatg@codeaurora.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox