diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2023-08-25 19:00:37 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2023-10-11 15:10:31 +0000 |
| commit | f9984cda960915c594a777d6423804bcaa0fab4e (patch) | |
| tree | 98e4e09db1d52cdc9d35a3f2c4c567ed3b61d563 | |
| parent | b53155d4dfc67ee3754d886a03682e8522d85b31 (diff) | |
| download | src-f9984cda960915c594a777d6423804bcaa0fab4e.tar.gz src-f9984cda960915c594a777d6423804bcaa0fab4e.zip | |
arm unwind: Reject unaligned stack pointers
Reviewed by: andrew
Differential Revision: https://reviews.freebsd.org/D41533
(cherry picked from commit 247e8662d2c080c27937ec4d62e80b2358e8c74f)
| -rw-r--r-- | sys/arm/arm/unwind.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sys/arm/arm/unwind.c b/sys/arm/arm/unwind.c index cdc9ef225ee7..591bae3dfc26 100644 --- a/sys/arm/arm/unwind.c +++ b/sys/arm/arm/unwind.c @@ -398,6 +398,9 @@ unwind_exec_insn(struct unwind_state *state) if (mask == 0) return 1; + if (!__is_aligned(vsp, sizeof(register_t))) + return 1; + /* Update SP */ update_vsp = 1; @@ -430,6 +433,9 @@ unwind_exec_insn(struct unwind_state *state) /* Read how many registers to load */ count = insn & INSN_POP_COUNT_MASK; + if (!__is_aligned(vsp, sizeof(register_t))) + return 1; + /* Update sp */ update_vsp = 1; @@ -460,6 +466,9 @@ unwind_exec_insn(struct unwind_state *state) if (mask == 0 || (mask & 0xf0) != 0) return 1; + if (!__is_aligned(vsp, sizeof(register_t))) + return 1; + /* Update SP */ update_vsp = 1; |