From nobody Wed Oct 11 15:44:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S5HBb1Yfrz4wK5Z; Wed, 11 Oct 2023 15:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S5HBb0wpLz3d1k; Wed, 11 Oct 2023 15:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697039063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aD+SHf6BkCWtxXU6EFDsg6ZWO56ufson7D4dX1BiGDI=; b=yNn1vLo3AW/vs6ObHGusNiSPUVySMg18AiirVS4x6vQzr7aVkHtoWUJpt5wf4y1Tfx/Cdp MzttYxXqwOGfisE3oXs8eo6qC8XGucRja+Rw/wD/5CKzODvhQhhUsoGBlxJRm7WzIR8yu5 O6My4KfYp1zCOZe17PK5YZm8PdFSBFqTGzEOOOkqGSOGLiJis+hwb9Gw2RxDGygKNZMKSV /0gGEBW99mFrq2BazlgP2G+CKiUoTer0Tj7qGxxJ/HwqsU6ZpQWjmKq1e9XOO7xrELnp3v 1DepDYTdpGo1AnTaKKUGGP6dWjbINIbnbvl55Bnh/ouN8NAI1t3+FGvainpVeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697039063; a=rsa-sha256; cv=none; b=GATKkAnRdwjEw/b3yvQWNFSGSSr4JXSniMX7hwIHHu21TBt5lxRX6AHecbz2dHG+UKCBtA XuEMeDHcQImyj0nEF+EPUn3RBluK2bpC716y3Rb2qZQHsHKqGVZ6DTC2U2CTyA2AcfqpIk cYIYv/gkpo+VeIwUBcickRIJmOq/HFEBL/+fsUJtR3MlGdoZOZiH+avbYQCDwApfuYkMle IdCwMFHdbSNQ0qyQ1GNvRbsubY5fx0Kee2COMzrDGbBjafgUe5xT7uJh6AWgL8D5u7qRF2 6RB5sa9FK+yIcKPX7ERKFjBtKN36ItfCrz/fDF6FK94YfaFnDWjbVPk3mL3m9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697039063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aD+SHf6BkCWtxXU6EFDsg6ZWO56ufson7D4dX1BiGDI=; b=W5yWK1W87pp/4uZtS6sHs07q4B804zTdfgF6LyaakkkS+L2F0Puyqhcl1eJr6lkYIT+AZV VJ/1LQWjfzqxzplL8w4VrwQYxR0XfzDy3QouGeizNyEsIA00IpGm9ydaA1ShDsmVfLM1jd UjFwhb9zlZLgElyLkDAZHQ6vX5cc0JRFGqi6ho0wFlFwLrsnJ6Ub/en8S7XfH8n6n110S9 MI2VRiOHyU5wwV50t65gzGa9dY2QdSYCRgnmlodvCdvlAYVA8RY2H0nGTDBb3Zm0uvK9Sr yHZHNGGmpDtX6RjVahWtCeW53uABb/cms1AruphnBvMvuJfQ1T/UmE4RpuehLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S5HBZ6qvhzC7C; Wed, 11 Oct 2023 15:44:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39BFiMlm023789; Wed, 11 Oct 2023 15:44:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BFiMP3023786; Wed, 11 Oct 2023 15:44:22 GMT (envelope-from git) Date: Wed, 11 Oct 2023 15:44:22 GMT Message-Id: <202310111544.39BFiMP3023786@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: f9984cda9609 - stable/14 - arm unwind: Reject unaligned stack pointers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f9984cda960915c594a777d6423804bcaa0fab4e Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f9984cda960915c594a777d6423804bcaa0fab4e commit f9984cda960915c594a777d6423804bcaa0fab4e Author: John Baldwin AuthorDate: 2023-08-25 19:00:37 +0000 Commit: John Baldwin CommitDate: 2023-10-11 15:10:31 +0000 arm unwind: Reject unaligned stack pointers Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D41533 (cherry picked from commit 247e8662d2c080c27937ec4d62e80b2358e8c74f) --- sys/arm/arm/unwind.c | 9 +++++++++ 1 file changed, 9 insertions(+) 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;