From patchwork Fri Jun 14 09:49:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: luanshi X-Patchwork-Id: 10994833 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 91A501398 for ; Fri, 14 Jun 2019 09:49:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 83AF7283C8 for ; Fri, 14 Jun 2019 09:49:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 77A6F283A2; Fri, 14 Jun 2019 09:49:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD3C0208C2 for ; Fri, 14 Jun 2019 09:49:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727059AbfFNJtz (ORCPT ); Fri, 14 Jun 2019 05:49:55 -0400 Received: from out30-44.freemail.mail.aliyun.com ([115.124.30.44]:33814 "EHLO out30-44.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726900AbfFNJtz (ORCPT ); Fri, 14 Jun 2019 05:49:55 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R121e4;CH=green;DM=||false|;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01f04446;MF=zhangliguang@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0TU8e0w4_1560505783; Received: from localhost(mailfrom:zhangliguang@linux.alibaba.com fp:SMTPD_---0TU8e0w4_1560505783) by smtp.aliyun-inc.com(127.0.0.1); Fri, 14 Jun 2019 17:49:51 +0800 From: luanshi To: "Rafael J. Wysocki" , Len Brown Cc: linux-acpi@vger.kernel.org, James Morse , Tony Luck , Borislav Petkov Subject: [PATCH] ACPI / APEI: release resources if gen_pool_add fails Date: Fri, 14 Jun 2019 17:49:43 +0800 Message-Id: <1560505783-130606-1-git-send-email-zhangliguang@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: James Morse Tested-by: James Morse --- 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)