target/arm: Add missing 'return's after calling v7m_exception_taken()
commit0c317eb3dd407f2ec7fcaccec79be6c3987573e2
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 23 Jul 2021 16:21:42 +0000 (23 17:21 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 27 Jul 2021 09:57:39 +0000 (27 10:57 +0100)
tree758dfa52b4c840f7d0363a92768be595f33df241
parent888f470f123521b4fc9974d2dd1cc48629d73adc
target/arm: Add missing 'return's after calling v7m_exception_taken()

In do_v7m_exception_exit(), we perform various checks as part of
performing the exception return.  If one of these checks fails, the
architecture requires that we take an appropriate exception on the
existing stackframe.  We implement this by calling
v7m_exception_taken() to set up to take the new exception, and then
immediately returning from do_v7m_exception_exit() without proceeding
any further with the unstack-and-exception-return process.

In a couple of checks that are new in v8.1M, we forgot the "return"
statement, with the effect that if bad code in the guest tripped over
these checks we would set up to take a UsageFault exception but then
blunder on trying to also unstack and return from the original
exception, with the probable result that the guest would crash.

Add the missing return statements.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210723162146.5167-3-peter.maydell@linaro.org
target/arm/m_helper.c