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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25231C072A2 for ; Wed, 15 Nov 2023 22:03:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344365AbjKOWD6 (ORCPT ); Wed, 15 Nov 2023 17:03:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344375AbjKOWD6 (ORCPT ); Wed, 15 Nov 2023 17:03:58 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 949E61A4 for ; Wed, 15 Nov 2023 14:03:54 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A68EC433C7; Wed, 15 Nov 2023 22:03:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1700085834; bh=eVn/oyioHFXnJqEdeT0RTcv4spXno6HiT3WyxlEnufo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UU7eAA9xb+b79svRJt/6+wYCw6rakPO1vCG7owQDGw3Hl7ziQsq4mH3aIH2pwlua7 /3KibXc25x7v7OY1rvNpztRsHXZi3ubyYoA62u8OUNVF5mXiC2G/y8O0tkJgJs99ym sXwtqr38untFyQ1ZoO8w9UYUMYPRhOMLFE9MaV24= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wang Yufen , "Naveen N. Rao" , Michael Ellerman , Sasha Levin Subject: [PATCH 5.4 085/119] powerpc/pseries: fix potential memory leak in init_cpu_associativity() Date: Wed, 15 Nov 2023 17:01:15 -0500 Message-ID: <20231115220135.286673774@linuxfoundation.org> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231115220132.607437515@linuxfoundation.org> References: <20231115220132.607437515@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wang Yufen [ Upstream commit 95f1a128cd728a7257d78e868f1f5a145fc43736 ] If the vcpu_associativity alloc memory successfully but the pcpu_associativity fails to alloc memory, the vcpu_associativity memory leaks. Fixes: d62c8deeb6e6 ("powerpc/pseries: Provide vcpu dispatch statistics") Signed-off-by: Wang Yufen Reviewed-by: "Naveen N. Rao" Signed-off-by: Michael Ellerman Link: https://msgid.link/1671003983-10794-1-git-send-email-wangyufen@huawei.com Signed-off-by: Sasha Levin --- arch/powerpc/platforms/pseries/lpar.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c index 55af0e4cf355b..52e466d4a33ca 100644 --- a/arch/powerpc/platforms/pseries/lpar.c +++ b/arch/powerpc/platforms/pseries/lpar.c @@ -522,8 +522,10 @@ static ssize_t vcpudispatch_stats_write(struct file *file, const char __user *p, if (cmd) { rc = init_cpu_associativity(); - if (rc) + if (rc) { + destroy_cpu_associativity(); goto out; + } for_each_possible_cpu(cpu) { disp = per_cpu_ptr(&vcpu_disp_data, cpu); -- 2.42.0