From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0CBBFC3A59E for ; Mon, 26 Aug 2019 09:06:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D5A6E22CF5 for ; Mon, 26 Aug 2019 09:06:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730541AbfHZJGS (ORCPT ); Mon, 26 Aug 2019 05:06:18 -0400 Received: from cloudserver094114.home.pl ([79.96.170.134]:41965 "EHLO cloudserver094114.home.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730527AbfHZJGS (ORCPT ); Mon, 26 Aug 2019 05:06:18 -0400 Received: from 79.184.255.249.ipv4.supernova.orange.pl (79.184.255.249) (HELO kreacher.localnet) by serwer1319399.home.pl (79.96.170.134) with SMTP (IdeaSmtpServer 0.83.275) id 5fd658606c77bc84; Mon, 26 Aug 2019 11:06:16 +0200 From: "Rafael J. Wysocki" To: Borislav Petkov Cc: luanshi , Len Brown , James Morse , Tony Luck , linux-acpi@vger.kernel.org Subject: Re: [PATCH v4.1] ACPI / APEI: release resources if gen_pool_add fails Date: Mon, 26 Aug 2019 11:06:15 +0200 Message-ID: <3203454.kQXdNjpmCg@kreacher> In-Reply-To: <20190813171619.GH16770@zn.tnic> References: <1563173924-47479-1-git-send-email-zhangliguang@linux.alibaba.com> <20190813171619.GH16770@zn.tnic> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org On Tuesday, August 13, 2019 7:16:19 PM CEST Borislav Petkov wrote: > Hi, > > here's v4.1 with the labels properly balanced. Applied, thanks! > --- > From: Liguang Zhang > Date: Mon, 15 Jul 2019 14:58:44 +0800 > Subject: [PATCH] ACPI / APEI: Release resources if gen_pool_add() fails > > Destroy ghes_estatus_pool and release memory allocated via vmalloc() on > errors in ghes_estatus_pool_init() in order to avoid memory leaks. > > [ bp: do the labels properly and with descriptive names and massage. ] > > Signed-off-by: Liguang Zhang > Signed-off-by: Borislav Petkov > Cc: "Rafael J. Wysocki" > Cc: James Morse > Cc: Len Brown > Cc: linux-acpi@vger.kernel.org > Cc: Tony Luck > Link: https://lkml.kernel.org/r/1563173924-47479-1-git-send-email-zhangliguang@linux.alibaba.com > --- > drivers/acpi/apei/ghes.c | 17 +++++++++++++++-- > 1 file changed, 15 insertions(+), 2 deletions(-) > > diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c > index a66e00fe31fe..66205ec54555 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; > > ghes_estatus_pool = gen_pool_create(GHES_ESTATUS_POOL_MIN_ALLOC_ORDER, -1); > if (!ghes_estatus_pool) > @@ -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 err_pool_alloc; > > /* > * New allocation must be visible in all pgd before it can be found by > @@ -172,7 +173,19 @@ 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 err_pool_add; > + > + return 0; > + > +err_pool_add: > + vfree((void *)addr); > + > +err_pool_alloc: > + gen_pool_destroy(ghes_estatus_pool); > + > + return -ENOMEM; > } > > static int map_gen_v2(struct ghes *ghes) >