mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
xen/arm: vgic: Check rank in GICD_ICFGR* emulation before locking
The function vgic_irq_rank may return NULL is the IRQ is not in range handled by the guest. This will result to derefence a NULL pointer which will crash Xen. I've checked the rest of the emulation and this is only place where the lock is taken before the rank is checked. This is CVE-2014-2986 / XSA-94. Signed-off-by: Julien Grall <julien.grall@linaro.org> Reported-by: Thomas Leonard <talex5@gmail.com> Reviewed-by: Jan Beulich <JBeulich@suse.com> Acked-by: Ian Campbell <ian.campbell@citrix.com>
This commit is contained in:
1 parent
6475d70005
commit
bf70db7cea
1 file changed
+1
-1
+1
-1
@@ -592,8 +592,8 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info)
|
||||
case GICD_ICFGR + 2 ... GICD_ICFGRN: /* SPIs */
|
||||
if ( dabt.size != 2 ) goto bad_width;
|
||||
rank = vgic_irq_rank(v, 2, gicd_reg - GICD_ICFGR);
|
||||
vgic_lock_rank(v, rank);
|
||||
if ( rank == NULL) goto write_ignore;
|
||||
vgic_lock_rank(v, rank);
|
||||
rank->icfg[REG_RANK_INDEX(2, gicd_reg - GICD_ICFGR)] = *r;
|
||||
vgic_unlock_rank(v, rank);
|
||||
return 1;
|
||||
|
||||