From nobody Fri Dec 19 18:53:44 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C041213453; Sun, 24 Mar 2024 23:08:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321731; cv=none; b=L/L/9iOR/Fa8TJTmyN0lX3ULhLJ9nPZ8JL2yFcmS3LDH2RCFdbyq8LERs3xQ0hwQQ/9zYCul9LtrnLhFbvvffBq7lHASTGb6FcaWVB+uAaYb8EJQCBnpbjTuV4a8hXEy2nitEh0eMhOaHMce4plLhZ1no1pEf+P+q6jMurCL7TA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321731; c=relaxed/simple; bh=0AF15nQ0mPwJN2Ne43cMsDMShEoe33XKgcwOIbXWDkU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WI01+ZaOXMuhXRanaWYruyF2Vfgee+Z6y3TM22wb3ScalVWRuI4BLre8JvIhXkrarMWQSvJqAH0cLBwCjjKMdTZdkG0J87fvcoNafvMtw/+QvgxD3LYc5pt3a3q3qEHf3Xz4SPzbYyebYT68FMh/MCCjEnyRvk632ATadAAiFbQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TTjQBoNk; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TTjQBoNk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19758C43390; Sun, 24 Mar 2024 23:08:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711321730; bh=0AF15nQ0mPwJN2Ne43cMsDMShEoe33XKgcwOIbXWDkU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TTjQBoNkJgmgwBqA7MtQstLeQJqISxUiKgEpUT2vzLkiDsC2dIARq9+SNHzBJWX/R 0XKFF+TpXuFlVIvfYgF8fe0QYYl45uSpCe9ZYOvGagorsAHHuywtRlme+/55gJm74w mimFBYXQlYteVWXVaA9LjwEeK2CQxuW/Phfs3iX+CEox5WeIcW9gJ0m8pAIs+bTNWl EbWeNqIpBcw3Ip6BUqSfF9H/4duA4G0lKXm3YpitReNkN5ZI81NOlS3zkIV2DJjjYr oSu80vFwdZibhzKJNne0zi/DzK0Ip4UhsxKRTxDqzWikg6ERJlUKNhHCyZqKJz0ovF EUviF4Vj1rhVg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christophe JAILLET , Ian Rogers , kernel-janitors@vger.kernel.org, Namhyung Kim , Sasha Levin Subject: [PATCH 6.6 458/638] perf pmu: Fix a potential memory leak in perf_pmu__lookup() Date: Sun, 24 Mar 2024 18:58:15 -0400 Message-ID: <20240324230116.1348576-459-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324230116.1348576-1-sashal@kernel.org> References: <20240324230116.1348576-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Christophe JAILLET [ Upstream commit ef5de1613d7d92bdc975e6beb34bb0fa94f34078 ] The commit in Fixes has reordered some code, but missed an error handling path. 'goto err' now, in order to avoid a memory leak in case of error. Fixes: f63a536f03a2 ("perf pmu: Merge JSON events with sysfs at load time") Signed-off-by: Christophe JAILLET Reviewed-by: Ian Rogers Cc: kernel-janitors@vger.kernel.org Signed-off-by: Namhyung Kim Link: https://lore.kernel.org/r/9538b2b634894c33168dfe9d848d4df31fd4d801.16= 93085544.git.christophe.jaillet@wanadoo.fr Signed-off-by: Sasha Levin --- tools/perf/util/pmu.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index a3c7814116c7c..86bfdf5db2135 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -992,10 +992,9 @@ struct perf_pmu *perf_pmu__lookup(struct list_head *pm= us, int dirfd, const char * type value and format definitions. Load both right * now. */ - if (pmu_format(pmu, dirfd, name)) { - free(pmu); - return NULL; - } + if (pmu_format(pmu, dirfd, name)) + goto err; + pmu->is_core =3D is_pmu_core(name); pmu->cpus =3D pmu_cpumask(dirfd, name, pmu->is_core); =20 --=20 2.43.0