diff options
| author | Olivier Houchard <cognet@FreeBSD.org> | 2021-06-30 20:56:50 +0000 |
|---|---|---|
| committer | Olivier Houchard <cognet@FreeBSD.org> | 2021-07-07 20:24:56 +0000 |
| commit | 9bc7bbcf214b9e15b67e42706cef770ede541913 (patch) | |
| tree | 5dd9e242092d46020c66ab417dea65a12d1eeb37 | |
| parent | c3e6df3967f9a64322ad493e0ecd7e8cffba018f (diff) | |
| download | src-9bc7bbcf214b9e15b67e42706cef770ede541913.tar.gz src-9bc7bbcf214b9e15b67e42706cef770ede541913.zip | |
arm: Make sure we can handle a thumb entry point.
Similarly to what's been done on arm64 with commit
712c060c94fd447c91b0e6218c12a431206b487a, when executing a binary, if the
entry point is a thumb symbol, then make sure we set the PSL_T flag, otherwise
the CPU will interpret it in ARM mode, and that will likely leads to an
undefined instruction.
PR: 256899
MFC after: 1 week
(cherry picked from commit 8c3bd133dd52824e427e350c65eae1fd9eb5a3cd)
Signed-off-by: Olivier Houchard <cognet@FreeBSD.org>
| -rw-r--r-- | sys/arm/arm/machdep.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c index f24df96ca3d6..a1354f303b3a 100644 --- a/sys/arm/arm/machdep.c +++ b/sys/arm/arm/machdep.c @@ -425,6 +425,8 @@ exec_setregs(struct thread *td, struct image_params *imgp, u_long stack) tf->tf_svc_lr = 0x77777777; tf->tf_pc = imgp->entry_addr; tf->tf_spsr = PSR_USR32_MODE; + if ((register_t)imgp->entry_addr & 1) + tf->tf_spsr |= PSR_T; } |