From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 202CF3EEADA for ; Fri, 15 May 2026 18:26:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778869598; cv=none; b=gnc/d1TpzYl4+FE1sJCFH73Nj+yHJwVQWxpDj3SC5YlWZ4fev1xV/m9WDdXdQGyvX4gg3HTbQC+h4vpW3DuaPViXyWS5uuXtzRm1Vwf8/pIWzMANkfM3bfm3DKETTy2i85mRhmw2M/g57VcFyvUEaUGeoevPxm86gQnQU9I8HcY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778869598; c=relaxed/simple; bh=f/nDi57hXZKLpfRoPJ5vE5kLX9ZIF184zHub2O3n6qI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=HkCbhSdMORw8tmzqvuRKWRlZl2hqvnmE+AauOBzSIwO0BG4hhAsT3CK4AMA2Dn9XMWpYMdYszDk+7XwS1YxKCHxr4sU3EzRgmTY2NNKydiHkGf0POCO8+5EtaB+sBtLW6yiucBfFaToHUKyx73yuuc6cA8JudpFv8ciu5Sr/E7I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=pJLRC+gT; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pJLRC+gT" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2b4650d5f5cso892515ad.0 for ; Fri, 15 May 2026 11:26:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778869596; x=1779474396; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=KU70qGgzHimS0wVKiiWBVevI3BHfnlIAnYvMEou4rn0=; b=pJLRC+gTEfrIX+A0wSex9r+OhXWcc359iTt7lbyk+IqJRFtOU0qR7sNxF/qEIs/abb 0LQYfBOu6LNs7khqsZHqoffoQHAufNCInRwnNFSCAkCynb0Q9e+gMyZoqWIUeo1Zvkqc QKdRIhisE+d3+tH1cjQrDYkLbu5FE01mFWlzOeVguWZ9rTYvZ8Qgq6YBxb3S7Q4zRnDr 9eF/EwNzYeQsXQkPQPk3azHfG1AEgeSYTGkXNvw53SJgKkLNnmsCV7u30ntGCB37/Vjc cwfP3BjFUb4yAJOFAV8hVxbUgbNUI/bpzeqKJf9nDr4a3kLDRy3hpoAWdOZzbwO9+5WT KxoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778869596; x=1779474396; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=KU70qGgzHimS0wVKiiWBVevI3BHfnlIAnYvMEou4rn0=; b=olTsxKn2M8ufXp7s7B4y2qh2sKDwsFaP2JaijHivmT8uMDeCsVyGaM2ibkL+hOumgj ntMbPZunwtsGiR+wP2n0aTRLYFptI1wdlr5ndTJ+kCc5G8DFg73PadGRGR983WqjuVok Ew+OGjNKfl4MU+BNoiZ5IrBOUmCf8tc6zVs2LP0XJhEGZRJAHeJa1BKjNQdJ4/9mGInm sH6/uLoAjySWiYw3dlTlhVzrpx8zyiMhKEbpfYXUJJwL8zckLXpndH1GvD/0VJvAbK4X pWQqJ/VYskkLFCsGVRcjGqAAacgaJwrTYyIM76PQ6jKArs6mIhvPMRIwiOGzLMaqfiGN yAJw== X-Gm-Message-State: AOJu0Yy6+4k3DAeU3XRWgm+ggkUDSC/NoC1gN20rRQPLP1ScKQP823Un 8q7TxedDl8maJwhPPvd5PXeoD2obKXB0iAldBMGamB1ibJbdl+Hk8ZSp X-Gm-Gg: Acq92OFTY72iHmyOlWz/ZjlXmjPfQQj833OML1QKruEAyHl0mEo9dPVcJIgMfPeo4zS Iw3IpWyCPUcl/pzcejWravMpRA0I/ZM/rJZWNFdcYJPUkBz2DUfDkpfJ0E7iNksYMlsWg7P8Jp3 kK8RM++oJ6zSMZceM2JoZPjCGrVyyd46mu1ZsHdzsuHJVDBfinYsjUh2JaxwDgCDQRRFQbckqsm AJzbdxRkUQoU2vbaQuTet+nBhUrOEGJ8jBjOogmy7dG1g9JZc1tVRppCrvCZzs1PJD73mpGHuQB yMEE9QmmDDxuUtjUFFZ+i0BilVyl4bozBkOnUZVECTJo0mUhEkWKvrD53/pP0gzDuWWJiioWzGH ICEsYT0i5g7OORDb5b4lGU0VOSmFHzR/XqXYXMPs0ji5etUpvIM1kA9kx6szUswrj+H0fh5vTKB W+eRy1GdjV/4KlfmFz32qA6oCgmeQhO234 X-Received: by 2002:a17:903:182:b0:2b9:cd2d:6f11 with SMTP id d9443c01a7336-2bd7e8bd35amr57059885ad.18.1778869596118; Fri, 15 May 2026 11:26:36 -0700 (PDT) Received: from gmail.com ([58.84.60.109]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2bd5d0fd279sm64428595ad.62.2026.05.15.11.26.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 May 2026 11:26:35 -0700 (PDT) From: Sumeet Pawnikar To: rafael@kernel.org, linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, sumeet4linux@gmail.com Subject: [PATCH] powercap: intel_rapl: Fix memory leak in rapl_add_package_cpuslocked() Date: Fri, 15 May 2026 23:56:16 +0530 Message-ID: <20260515182616.227707-1-sumeet4linux@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When topology_physical_package_id()/topology_logical_die_id() returns a negative value, rapl_add_package_cpuslocked() returns ERR_PTR(-EINVAL) directly without freeing the rapl_package structure that was just allocated by kzalloc_obj(), leaking memory on every failed package addition. Use the existing err_free_package label so that the allocation is released on the error path. Signed-off-by: Sumeet Pawnikar --- drivers/powercap/intel_rapl_common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c index a8dd02dff0a0..f8afb4461e45 100644 --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -1770,7 +1770,8 @@ struct rapl_package *rapl_add_package_cpuslocked(int id, struct rapl_if_priv *pr topology_physical_package_id(id) : topology_logical_die_id(id); if ((int)(rp->id) < 0) { pr_err("topology_logical_(package/die)_id() returned a negative value"); - return ERR_PTR(-EINVAL); + ret = -EINVAL; + goto err_free_package; } rp->lead_cpu = id; if (!rapl_msrs_are_pkg_scope() && topology_max_dies_per_package() > 1) -- 2.43.0