Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: utils/irqchip: plic: Ensure no out-of-bound access in priority save/restore helpers

Browse Source 
Currently the priority save/restore helpers writes/reads the provided
array using an index whose maximum value is determined by PLIC, which
potentially may disagree with the caller to these helpers.

Add a parameter to ask the caller to provide the size limit of the
array to ensure no out-of-bound access happens.

Signed-off-by: Bin Meng <bmeng@tinylab.org>
Reviewed-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Bin Meng
2022-12-11 14:54:21 +08:00
committed by Anup Patel
parent 34da6638ad
commit 8509e46ca6
5 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/utils/irqchip/fdt_irqchip_plic.c
View File

@@ -24,18 +24,18 @@ static struct plic_data plic[PLIC_MAX_NR];
static struct plic_data *plic_hartid2data[SBI_HARTMASK_MAX_BITS];
static int plic_hartid2context[SBI_HARTMASK_MAX_BITS][2];
void fdt_plic_priority_save(u8 *priority)
void fdt_plic_priority_save(u8 *priority, u32 num)
{
struct plic_data *plic = plic_hartid2data[current_hartid()];
plic_priority_save(plic, priority);
plic_priority_save(plic, priority, num);
}
void fdt_plic_priority_restore(const u8 *priority)
void fdt_plic_priority_restore(const u8 *priority, u32 num)
{
struct plic_data *plic = plic_hartid2data[current_hartid()];
plic_priority_restore(plic, priority);
plic_priority_restore(plic, priority, num);
}
void fdt_plic_context_save(bool smode, u32 *enable, u32 *threshold)

9
lib/utils/irqchip/plic.c
View File

@@ -36,15 +36,16 @@ static void plic_set_priority(const struct plic_data *plic, u32 source, u32 val)
writel(val, plic_priority);
}
void plic_priority_save(const struct plic_data *plic, u8 *priority)
void plic_priority_save(const struct plic_data *plic, u8 *priority, u32 num)
{
for (u32 i = 1; i <= plic->num_src; i++)
for (u32 i = 1; i <= num; i++)
priority[i] = plic_get_priority(plic, i);
}
void plic_priority_restore(const struct plic_data *plic, const u8 *priority)
void plic_priority_restore(const struct plic_data *plic, const u8 *priority,
u32 num)
{
for (u32 i = 1; i <= plic->num_src; i++)
for (u32 i = 1; i <= num; i++)
plic_set_priority(plic, i, priority[i]);
}