Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3097096ybj; Mon, 23 Sep 2019 14:48:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqyX7+ZHpX0IrULQqyxVuoQoM/4QFJTiXnFTqyty3d7bbEhTliymYF8EMhBXb0Bre/GtvmUT X-Received: by 2002:a50:baa5:: with SMTP id x34mr2490714ede.148.1569275320191; Mon, 23 Sep 2019 14:48:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569275320; cv=none; d=google.com; s=arc-20160816; b=uio2yHWe21nlVe6D3bp8KW23RfFI8j3Xe1jwIO+MC/GArEx5cv5psmFCo1dSgL2h3m MQQhp32ZnfZ/Ia9VK3aySKHf34eFBTLoeSgEv4QiaOjHd9mcvIFUIEhln00bXJq+E+6r WCiTGeIbK5YERpSEoM5w5iSlLBFxDXR6/YafG38M4QM50gebpK19jQGwGig5URQxcMHT AufUY6Sz3ItQazq64An5exxYBuKgRr3y+ITpHJzrencmDBXaoYUHTwIv5XlA31kKrvSm ZKK9ykPiP/BBcu0zkqjfQVlL2M/XzfJXpMRZgoa5yaUpDzBsCkOdBa4DO9J/Los5efAJ SHSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ml/yE1zcGVI+xR7Ol/G+uuKF+S+LDQsNNxRgcyZ83W4=; b=lokfbhGQXGinx5IpRS5MfSw+IZc360hkuuiFQlCgPl9medEuWGX6j0IyTelX6xOIw4 F8YhsC5J5NgwFB/bFjIu1AzLHo1SyEqmTVxGjbXeurqdDyYREQFlTppxUsYYDfoj+IsQ 69L/M/hcprsn+fBrQcZ7xFQ1UP0F0aD6sz5Yq0DHftiPPq7Gpc3snde9LS8EASBGbviM FYMYCZs+66xdbGoxulso0t3BN/hDXOTPaSZF/QB5x3QRgfSAh1q08+PIE0j1GwqlxdcO 8bkGVGZSrSf3nU1HdM0g0nCfndWTG0EwtH13z5WDu9FRVp+S6Ns8lG2ytyJO4PYiimbZ X+UQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kvq2TLNn; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u3si6892754edy.48.2019.09.23.14.48.16; Mon, 23 Sep 2019 14:48:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kvq2TLNn; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390558AbfIVSrH (ORCPT + 99 others); Sun, 22 Sep 2019 14:47:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:43306 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390447AbfIVSq7 (ORCPT ); Sun, 22 Sep 2019 14:46:59 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8C474206C2; Sun, 22 Sep 2019 18:46:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178018; bh=/1Doc4+p/q9z3gLW6wxPhUbWI8u6hlwl8Sqo2S/AsAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kvq2TLNnwkj4Fu27nigvSEuBnsYImFMRq7/AFkHlvpAdkiS1JyffbzDW60x1Doh21 HsRBl6wh/I+KfgjkaoXmtRLm5F4oxPWEoG13GGw4IJOpPAe8w432snnVxBEqH4d5I3 nWuaPUm/CxbvbuIQqcgCN+OmAWIDTByQuZdLoNjI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Liguang Zhang , Borislav Petkov , "Rafael J . Wysocki" , Sasha Levin , linux-acpi@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 104/203] ACPI / APEI: Release resources if gen_pool_add() fails Date: Sun, 22 Sep 2019 14:42:10 -0400 Message-Id: <20190922184350.30563-104-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Liguang Zhang [ Upstream commit 6abc7622271dc520f241462e2474c71723638851 ] 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 Link: https://lkml.kernel.org/r/1563173924-47479-1-git-send-email-zhangliguang@linux.alibaba.com Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- 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 a66e00fe31fec..66205ec545553 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) -- 2.20.1