From: Jinjie Ruan <2118537295@qq.com>
To: babu.moger@amd.com, ben.horgan@arm.com, bp@alien8.de,
catalin.marinas@arm.com, dave.hansen@linux.intel.com,
Dave.Martin@arm.com, fenghuay@nvidia.com, gshan@redhat.com,
hpa@zytor.com, james.morse@arm.com, jic23@kernel.org,
mingo@redhat.com, reinette.chatre@intel.com,
ruanjinjie@huawei.com, tan.shaopeng@fujitsu.com, tglx@kernel.org,
tony.luck@intel.com, zengheng4@huawei.com, x86@kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v10 03/15] arm_mpam: Fix error return in resctrl_arch_mon_ctx_alloc()
Date: Mon, 19 Oct 2026 15:33:29 +0800 [thread overview]
Message-ID: <tencent_6E714C38215EDE224A09CD181D4BAF20A50A@qq.com> (raw)
In-Reply-To: <20261019073453.2142856-1-2118537295@qq.com>
From: Jinjie Ruan <ruanjinjie@huawei.com>
resctrl_arch_mon_ctx_alloc() stores the allocation result in a
heap-allocated int and returns the pointer unconditionally. When
allocation fails with anything other than a retryable -ENOSPC (e.g.
-EINVAL, -EOPNOTSUPP, or -ENOSPC with a pending signal), the caller
receives a valid heap pointer that IS_ERR() does not detect.
The caller then treats the error code as a monitor index: hardware
reads use an out-of-range index, and resctrl_arch_mon_ctx_free() hands
it to ida_free(), corrupting the allocator state.
Return ERR_PTR() when the allocation failed.
Fixes: 2a3c79c61539 ("arm_mpam: resctrl: Allow resctrl to allocate monitors")
Cc: James Morse <james.morse@arm.com>
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
---
drivers/resctrl/mpam_resctrl.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/resctrl/mpam_resctrl.c b/drivers/resctrl/mpam_resctrl.c
index 9d223057953a..945be7465ad3 100644
--- a/drivers/resctrl/mpam_resctrl.c
+++ b/drivers/resctrl/mpam_resctrl.c
@@ -413,6 +413,13 @@ void *resctrl_arch_mon_ctx_alloc(struct rdt_resource *r,
} while (*ret == -ENOSPC && !signal_pending(current));
finish_wait(&resctrl_mon_ctx_waiters, &wait);
+ if (*ret < 0) {
+ int err = *ret;
+
+ kfree(ret);
+ return ERR_PTR(err);
+ }
+
return ret;
}
--
2.43.0
next prev parent reply other threads:[~2026-10-19 7:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20261019073453.2142856-1-2118537295@qq.com>
2026-10-19 7:33 ` [PATCH v10 01/15] fs/resctrl: Return -EBUSY when per-CLOSID RMIDs are in limbo Jinjie Ruan
2026-10-19 8:27 ` Jinjie Ruan
2026-10-19 7:33 ` [PATCH v10 02/15] fs/resctrl: Skip monitor context allocation when force-freeing RMIDs Jinjie Ruan
2026-10-19 7:33 ` Jinjie Ruan [this message]
2026-10-19 7:33 ` [PATCH v10 04/15] arm_mpam: Fix infinite PARTID reset loop when 65536 PARTIDs are supported Jinjie Ruan
2026-10-19 7:33 ` [PATCH v10 05/15] arm_mpam: Don't stall MPAM enable when an MSC fails to probe Jinjie Ruan
2026-10-19 7:33 ` [PATCH v10 06/15] fs/resctrl: Unmount resctrl with the CDP state it was mounted with Jinjie Ruan
2026-10-19 7:33 ` [PATCH v10 07/15] fs/resctrl: Add resctrl_arch_rmid_idx_match() helper Jinjie Ruan
2026-10-19 7:33 ` [PATCH v10 08/15] arm_mpam: resctrl: Add resctrl_closid_rmid_to_partid_pmg() helper Jinjie Ruan
2026-10-19 7:33 ` [PATCH v10 09/15] arm_mpam: Add a helper to check a PARTID is in a CLOSID Jinjie Ruan
2026-10-19 7:33 ` [PATCH v10 10/15] arm_mpam: Track the PARTID and internal PARTID limits per class Jinjie Ruan
2026-10-19 7:33 ` [PATCH v10 11/15] arm_mpam: Divide the PARTIDs between the control groups Jinjie Ruan
2026-10-19 7:33 ` [PATCH v10 12/15] arm_mpam: Map resctrl RMIDs onto the request PARTIDs Jinjie Ruan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tencent_6E714C38215EDE224A09CD181D4BAF20A50A@qq.com \
--to=2118537295@qq.com \
--cc=Dave.Martin@arm.com \
--cc=babu.moger@amd.com \
--cc=ben.horgan@arm.com \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=dave.hansen@linux.intel.com \
--cc=fenghuay@nvidia.com \
--cc=gshan@redhat.com \
--cc=hpa@zytor.com \
--cc=james.morse@arm.com \
--cc=jic23@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=reinette.chatre@intel.com \
--cc=ruanjinjie@huawei.com \
--cc=tan.shaopeng@fujitsu.com \
--cc=tglx@kernel.org \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
--cc=zengheng4@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®