mirror of
https://github.com/riscv-software-src/opensbi.git
synced 2026-11-19 02:21:38 +00:00
lib: sbi_pmu: unmap shared memory on the early exit in event_get_info
sbi_pmu_event_get_info() maps the caller's shared memory into M-mode with sbi_hart_protection_temp_map_range(). The must-be-zero check added inside the event loop returns straight to the supervisor without reaching the matching temp_unmap_range() at the end of the function, so the mapping is left behind. This has a security impact beyond leaking a mapping. Under Smepmp the temporary mapping is a single reserved PMP entry, SBI_SMEPMP_RESV_ENTRY. sbi_hart_smepmp_temp_map_range() refuses to reprogram that entry while it is already enabled: if (sbi_hart_is_pmp_enabled(SBI_SMEPMP_RESV_ENTRY)) return SBI_ENOSPC; and no caller in the tree checks that return value. sbi_pmu.c, sbi_sse.c, sbi_mpxy.c, sbi_dbtr.c and sbi_ecall_dbcn.c all discard it. So once the entry is left behind, every later shared memory ecall on that hart runs with PMP 0 still covering the previous region, and M-mode faults the first time it dereferences the new buffer. A supervisor triggers this with one ecall carrying a reserved bit in the first event_idx. The next SBI_EXT_DBCN_CONSOLE_WRITE then takes an M-mode load access fault on the console buffer and the firmware stops making forward progress, taking DBCN, SSE, MPXY and DBTR down with it on that hart. It also breaks the Smepmp invariant that M-mode does not retain standing access to supervisor memory. Confirmed on qemu virt with a bare metal S-mode payload, QEMU 8.2.2: build -cpu protection result master6ad246a1rv64 pmp completes master6ad246a1rv64,smepmp=true epmp firmware dies master + this patch rv64,smepmp=true epmp completes The middle row leaves this as the last entry in the QEMU exception trace, where the epc is inside nputs() in M-mode and the tval is the supervisor console buffer: cause:0000000000000005, epc:0x000000008000204c, tval:0x0000000080500000, desc=fault_load Without Smepmp the map and unmap pair compiles down to nothing, which is why the first row survives. This only affects master. v1.9 and earlier have the same map and unmap pair but no return between them, so no released version needs a backport. Route the early exit through the existing unmap. Fixes:d97cfb33ae("lib: sbi_pmu: Return invalid param error for reserved event_idx bits") Signed-off-by: Sebastian Alba Vives <sebasjosue84@gmail.com> Reviewed-by: Anup Patel <anup@brainfault.org> Link: https://lore.kernel.org/r/20261012022033.1165060-1-sebasjosue84@gmail.com Signed-off-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
1 parent
663786edae
commit
0ce50ae8fa
1 file changed
+7
-4
+7
-4
@@ -1081,7 +1081,7 @@ int sbi_pmu_event_get_info(unsigned long shmem_phys_lo, unsigned long shmem_phys
|
||||
unsigned long num_events, unsigned long flags)
|
||||
{
|
||||
unsigned long shmem_size = num_events * sizeof(struct sbi_pmu_event_info);
|
||||
int i, j, event_type;
|
||||
int i, j, event_type, ret = 0;
|
||||
struct sbi_pmu_event_info *einfo;
|
||||
struct sbi_pmu_hart_state *phs = pmu_thishart_state_ptr();
|
||||
uint32_t event_idx;
|
||||
@@ -1118,8 +1118,10 @@ int sbi_pmu_event_get_info(unsigned long shmem_phys_lo, unsigned long shmem_phys
|
||||
for (i = 0; i < num_events; i++) {
|
||||
event_idx = einfo[i].event_idx;
|
||||
/* Any must-be-zero event_idx bits set should return INVALID_PARAM per-spec */
|
||||
if (event_idx & SBI_PMU_EVENT_IDX_MBZ_MASK)
|
||||
return SBI_ERR_INVALID_PARAM;
|
||||
if (event_idx & SBI_PMU_EVENT_IDX_MBZ_MASK) {
|
||||
ret = SBI_ERR_INVALID_PARAM;
|
||||
goto out_unmap;
|
||||
}
|
||||
event_type = pmu_event_validate(phs, event_idx, einfo[i].event_data);
|
||||
if (event_type < 0) {
|
||||
einfo[i].output = 0;
|
||||
@@ -1160,9 +1162,10 @@ int sbi_pmu_event_get_info(unsigned long shmem_phys_lo, unsigned long shmem_phys
|
||||
}
|
||||
}
|
||||
|
||||
out_unmap:
|
||||
sbi_hart_protection_temp_unmap_range(shmem_phys_lo, shmem_size);
|
||||
|
||||
return 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void pmu_reset_event_map(struct sbi_pmu_hart_state *phs)
|
||||
|
||||
Reference in new issue
Block a user