cpu: Assert asidx_from_attrs return value in range

Backports commit 9c8c334b0637bf3c592d432b0c11f3b62dd5dba3 from qemu
This commit is contained in:
Richard Henderson 2018-07-03 19:43:43 -04:00 committed by Lioncash
parent 0cf14f0d13
commit 8bd115214d
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7

View file

@ -502,11 +502,13 @@ static inline hwaddr cpu_get_phys_page_debug(CPUState *cpu, vaddr addr)
static inline int cpu_asidx_from_attrs(CPUState *cpu, MemTxAttrs attrs)
{
CPUClass *cc = CPU_GET_CLASS(cpu->uc, cpu);
int ret = 0;
if (cc->asidx_from_attrs) {
return cc->asidx_from_attrs(cpu, attrs);
ret = cc->asidx_from_attrs(cpu, attrs);
assert(ret < cpu->num_ases && ret >= 0);
}
return 0;
return ret;
}
#endif