linux-kernel - Re: [PATCH v2 2/2] mmc: cqhci: Fix a tiny potential memory leak on error condition

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAPDyKFqOgFMH3r8svC--fy88g5geuxGFMZ7VTYGfPGY7C3C9OA@mail.gmail.com>
Date:   Wed, 27 Feb 2019 15:11:08 +0100
From:   Ulf Hansson <ulf.hansson@...aro.org>
To:     Alamy Liu <alamy.liu@...il.com>
Cc:     Adrian Hunter <adrian.hunter@...el.com>,
        Asutosh Das <asutoshd@...eaurora.org>,
        Ritesh Harjani <riteshh@...eaurora.org>,
        "linux-mmc@...r.kernel.org" <linux-mmc@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        "# 4.0+" <stable@...r.kernel.org>
Subject: Re: [PATCH v2 2/2] mmc: cqhci: Fix a tiny potential memory leak on
 error condition

On Mon, 25 Feb 2019 at 20:22, Alamy Liu <alamy.liu@...il.com> wrote:
>
> Free up the allocated memory in the case of error return
>
> --- code study ---

Using three dashes makes "git am" believe this hole text snippet is a
comment and drops it from the changelog. I fixed it up this time, no
worries.

> 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@...il.com>

Applied for fixes and added a stable tag, thanks!

Kind regards
Uffe


> ---
>  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,
> --
> 2.17.1
>