mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 23:33:54 -06:00
hw/intc/arm_gicv3_its: Check table bounds against correct limit
Currently when we fill in a TableDesc based on the value the guest has written to the GITS_BASER<n> register, we calculate both: * num_entries : the number of entries in the table, constrained by the amount of memory the guest has given it * num_ids : the number of IDs we support for this table, constrained by the implementation choices and the architecture (eg DeviceIDs are 16 bits, so num_ids is 1 << 16) When validating ITS commands, however, we check only num_ids, thus allowing a broken guest to specify table entries that index off the end of it. This will only corrupt guest memory, but the ITS is supposed to reject such commands as invalid. Instead of calculating both num_entries and num_ids, set num_entries to the minimum of the two limits, and check that. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20220122182444.724087-13-peter.maydell@linaro.org
This commit is contained in:
parent
0ffe88e691
commit
8b8bb0146b
2 changed files with 9 additions and 10 deletions
|
@ -47,7 +47,6 @@ typedef struct {
|
|||
uint16_t entry_sz;
|
||||
uint32_t page_sz;
|
||||
uint32_t num_entries;
|
||||
uint32_t num_ids;
|
||||
uint64_t base_addr;
|
||||
} TableDesc;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue