From patchwork Mon Jul 15 06:58:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: luanshi X-Patchwork-Id: 11043415 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 53D07138D for ; Mon, 15 Jul 2019 06:58:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41EC726D08 for ; Mon, 15 Jul 2019 06:58:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 32ABC26E3D; Mon, 15 Jul 2019 06:58:58 +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 511E926D08 for ; Mon, 15 Jul 2019 06:58:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729135AbfGOG64 (ORCPT ); Mon, 15 Jul 2019 02:58:56 -0400 Received: from out30-130.freemail.mail.aliyun.com ([115.124.30.130]:41410 "EHLO out30-130.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728933AbfGOG64 (ORCPT ); Mon, 15 Jul 2019 02:58:56 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R131e4;CH=green;DM=||false|;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e07417;MF=zhangliguang@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0TWufh.a_1563173924; Received: from localhost(mailfrom:zhangliguang@linux.alibaba.com fp:SMTPD_---0TWufh.a_1563173924) by smtp.aliyun-inc.com(127.0.0.1); Mon, 15 Jul 2019 14:58:50 +0800 From: luanshi To: "Rafael J. Wysocki" , Len Brown Cc: James Morse , Tony Luck , Borislav Petkov , linux-acpi@vger.kernel.org Subject: [PATCH v4] ACPI / APEI: release resources if gen_pool_add fails Date: Mon, 15 Jul 2019 14:58:44 +0800 Message-Id: <1563173924-47479-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 Zhang Reviewed-by: James Morse --- drivers/acpi/apei/ghes.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index a66e00f..6d42ae1 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -153,10 +153,11 @@ 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) - return -ENOMEM; + goto nomem; len = GHES_ESTATUS_CACHE_AVG_SIZE * GHES_ESTATUS_CACHE_ALLOCED_MAX; len += (num_ghes * GHES_ESOURCE_PREALLOC_MAX_SIZE); @@ -164,7 +165,7 @@ 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) - return -ENOMEM; + goto pool_destroy; /* * New allocation must be visible in all pgd before it can be found by @@ -172,7 +173,17 @@ 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) + goto pool_destroy; + return 0; + +pool_destroy: + gen_pool_destroy(ghes_estatus_pool); + if (addr) + vfree((void *)addr); +nomem: + return -ENOMEM; } static int map_gen_v2(struct ghes *ghes)