Revisión | 9c8c334b0637bf3c592d432b0c11f3b62dd5dba3 (tree) |
---|---|
Tiempo | 2018-07-03 00:09:49 |
Autor | Richard Henderson <richard.henderson@lina...> |
Commiter | Richard Henderson |
cpu: Assert asidx_from_attrs return value in range
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
@@ -620,11 +620,13 @@ static inline hwaddr cpu_get_phys_page_debug(CPUState *cpu, vaddr addr) | ||
620 | 620 | static inline int cpu_asidx_from_attrs(CPUState *cpu, MemTxAttrs attrs) |
621 | 621 | { |
622 | 622 | CPUClass *cc = CPU_GET_CLASS(cpu); |
623 | + int ret = 0; | |
623 | 624 | |
624 | 625 | if (cc->asidx_from_attrs) { |
625 | - return cc->asidx_from_attrs(cpu, attrs); | |
626 | + ret = cc->asidx_from_attrs(cpu, attrs); | |
627 | + assert(ret < cpu->num_ases && ret >= 0); | |
626 | 628 | } |
627 | - return 0; | |
629 | + return ret; | |
628 | 630 | } |
629 | 631 | #endif |
630 | 632 |