From: "Rafael J. Wysocki" <rafael@kernel.org>
To: luanshi <zhangliguang@linux.alibaba.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Len Brown <lenb@kernel.org>,
ACPI Devel Maling List <linux-acpi@vger.kernel.org>,
James Morse <james.morse@arm.com>,
Tony Luck <tony.luck@intel.com>, Borislav Petkov <bp@alien8.de>
Subject: Re: [PATCH] ACPI / APEI: release resources if gen_pool_add fails
Date: Fri, 14 Jun 2019 11:27:20 +0200 [thread overview]
Message-ID: <CAJZ5v0hsrbG0Cp6NY+45NEYCnjjibAvtD36fHEdBoTSRTspvAA@mail.gmail.com> (raw)
In-Reply-To: <1560478845-19818-1-git-send-email-zhangliguang@linux.alibaba.com>
On Fri, Jun 14, 2019 at 4:20 AM luanshi <zhangliguang@linux.alibaba.com> wrote:
>
> If gen_pool_add fails, then ensure that ghes_estatus_pool and vmalloc
> resources are released to avoid memory leak.
The patch does more than this, it also destroys ghes_estatus_pool if
vmalloc() fails.
What about using this changelog:
"To avoid memory leaks, destroy ghes_estatus_pool and release memory
allocated via vmalloc() on errors in ghes_estatus_pool_init()."
> Signed-off-by: liguang.zlg <zhangliguang@linux.alibaba.com>
> ---
> drivers/acpi/apei/ghes.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
> index 993940d..8472c96 100644
> --- a/drivers/acpi/apei/ghes.c
> +++ b/drivers/acpi/apei/ghes.c
> @@ -153,6 +153,7 @@ static void ghes_unmap(void __iomem *vaddr, enum fixed_addresses fixmap_idx)
> int ghes_estatus_pool_init(int num_ghes)
> {
> unsigned long addr, len;
> + int rc = 0;
>
> ghes_estatus_pool = gen_pool_create(GHES_ESTATUS_POOL_MIN_ALLOC_ORDER, -1);
> if (!ghes_estatus_pool)
> @@ -163,8 +164,10 @@ int ghes_estatus_pool_init(int num_ghes)
>
> ghes_estatus_pool_size_request = PAGE_ALIGN(len);
> addr = (unsigned long)vmalloc(PAGE_ALIGN(len));
> - if (!addr)
> + if (!addr) {
> + gen_pool_destroy(ghes_estatus_pool);
> return -ENOMEM;
> + }
>
> /*
> * New allocation must be visible in all pgd before it can be found by
> @@ -172,7 +175,12 @@ int ghes_estatus_pool_init(int num_ghes)
> */
> vmalloc_sync_all();
>
> - return gen_pool_add(ghes_estatus_pool, addr, PAGE_ALIGN(len), -1);
> + rc = gen_pool_add(ghes_estatus_pool, addr, PAGE_ALIGN(len), -1);
> + if (rc) {
> + vfree(addr);
> + gen_pool_destroy(ghes_estatus_pool);
> + }
> + return rc;
> }
>
> static int map_gen_v2(struct ghes *ghes)
> --
> 1.8.3.1
>
next prev parent reply other threads:[~2019-06-14 9:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-14 2:20 [PATCH] ACPI / APEI: release resources if gen_pool_add fails luanshi
2019-06-14 9:27 ` Rafael J. Wysocki [this message]
2019-06-14 9:42 ` 乱石
2019-06-14 9:49 luanshi
2019-06-14 14:51 ` James Morse
2019-06-15 0:55 ` 乱石
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=CAJZ5v0hsrbG0Cp6NY+45NEYCnjjibAvtD36fHEdBoTSRTspvAA@mail.gmail.com \
--to=rafael@kernel.org \
--cc=bp@alien8.de \
--cc=james.morse@arm.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=tony.luck@intel.com \
--cc=zhangliguang@linux.alibaba.com \
/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;
as well as URLs for NNTP newsgroup(s).