hw/intc/loongarch_pch_pic: Validate htmsi_vector before indexing parent_irq
PATCH 1/1 hw/intc/loongarch_pch_pic: Validate htmsi_vector before indexing parent_irq
pch_pic_update_irq() used the guest-writable htmsi_vector[irq] value as an index into parent_irq[] without checking bounds. A value >= irq_num (64 in the array, but only 32 are used by the virt machine) causes an out-of-bounds read and a guest-triggerable QEMU crash.
Validate the vector before calling qemu_set_irq() in both the raise and lower paths and log a guest error if it is out of range.
Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/4114
--- hw/intc/loongarch_pch_pic.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
hw/intc/loongarch_pch_pic.c +17 -2
@@ -19,13 +19,21 @@ static void pch_pic_update_irq(LoongArchPICCommonState *s, uint64_t mask, {uint64_t val;int irq; +uint8_t vector;if (level) { val = mask & s->intirr & ~s->int_mask;if (val) { irq =ctz64 (val); + vector = s->htmsi_vector[irq]; +if (vector >= s->irq_num) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: htmsi_vector[%d]=%u out of range\n" , + __func__, irq, vector); +return ; + } s->intisr |=MAKE_64BIT_MASK (irq,1 ); -qemu_set_irq (s->parent_irq[s->htmsi_vector[irq]],1 ); +qemu_set_irq (s->parent_irq[vector],1 ); } }else {/*
@@ -35,8 +43,15 @@ static void pch_pic_update_irq(LoongArchPICCommonState *s, uint64_t mask, val = mask & s->intisr & ~s->intirr;if (val) { irq =ctz64 (val); + vector = s->htmsi_vector[irq]; +if (vector >= s->irq_num) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: htmsi_vector[%d]=%u out of range\n" , + __func__, irq, vector); +return ; + } s->intisr &= ~MAKE_64BIT_MASK (irq,1 ); -qemu_set_irq (s->parent_irq[s->htmsi_vector[irq]],0 ); +qemu_set_irq (s->parent_irq[vector],0 ); } } }
Signature · 1 line
2.50.1 (Apple Git-155)
Quoted 50 lines · Bin Guo
pch_pic_update_irq()used the guest-writable htmsi_vector[irq] value as an index into parent_irq[] without checking bounds. A value >=irq_num(64 in the array, but only 32 are used by the virt machine) causes an out-of-bounds read and a guest-triggerable QEMU crash.Validate the vector before calling
qemu_set_irq()in both the raise and lower paths and log a guest error if it is out of range.Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/4114
Signed-off-by Bin Guo <[email protected]>--- hw/intc/loongarch_pch_pic.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)hw/intc/loongarch_pch_pic.c +12
-1@@ -19,13 +19,21 @@ static void pch_pic_update_irq(LoongArchPICCommonState *s, uint64_t mask, {uint64_t val;int irq; +uint8_t vector;if (level) { val = mask & s->intirr & ~s->int_mask;if (val) { irq =ctz64 (val); + vector = s->htmsi_vector[irq]; +if (vector >= s->irq_num) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: htmsi_vector[%d]=%u out of range\n" , + __func__, irq, vector); +return ; + } s->intisr |=MAKE_64BIT_MASK (irq,1 ); -qemu_set_irq (s->parent_irq[s->htmsi_vector[irq]],1 ); +qemu_set_irq (s->parent_irq[vector],1 ); } }else {/* @@ -35,8 +43,15 @@ static void pch_pic_update_irq(LoongArchPICCommonState *s, uint64_t mask, val = mask & s->intisr & ~s->intirr;if (val) { irq =ctz64 (val); + vector = s->htmsi_vector[irq]; +if (vector >= s->irq_num) { + qemu_log_mask(LOG_GUEST_ERROR,
hw/intc/loongarch_pch_pic.c static void pch_pic_update_irq(LoongArchPICCommonState *s, uint64_t mask, · line 57
Quoted 10 lines
hw/intc/loongarch_pch_pic.c +5
-1+"%s: htmsi_vector[%d]=%u out of range\n" , + __func__, irq, vector); +return ; + } s->intisr &= ~MAKE_64BIT_MASK (irq,1 ); -qemu_set_irq (s->parent_irq[s->htmsi_vector[irq]],0 ); +qemu_set_irq (s->parent_irq[vector],0 ); } } }
Hi Bin,
Thanks for solving this problem.
Regards
Bibo Mao