From nobody Wed Nov 16 18:31:14 2022 X-Original-To: dev-commits-src-main@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 4NCBSy6YbMz4hGkn; Wed, 16 Nov 2022 18:31:14 +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 4NCBSy5xvvz3RCV; Wed, 16 Nov 2022 18:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668623474; 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=9vRnxbfhiH6FO6seClETcaSGUFjAx/pJhCPk+E72CkQ=; b=k6l6m21Q7e4d6FGb1voBCYq6pUogIAXhMSuVbqBHkPllCRTfEBX+YyR3e4FlDveNV023TC XRck5mHFlQECJ4cY0zUGFpC6cu7EZcTV/QNdj7wrv/F3bCG4FyyOPnfHNQMxQekAC9xNVz skkwLZKz6xKOw7hz72taaGUrZqrWkX4s+1A307t3y0TRYADbkr7Zltl1YuaiSn5euUXVxO KLY//tpGNcYYwEelpRVAAFafkqFwjjo1mnp05g78by/G+qmdfeFSSb8mlajqAcYfJpFYQA ce1AVb2NZlHgJoO5tNTCxqp0jhsRqPkbIbTS8burJ27Pushj/pk1VRVjwwituw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668623474; 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=9vRnxbfhiH6FO6seClETcaSGUFjAx/pJhCPk+E72CkQ=; b=j1fZqF4bc96z49Dxi1emny1EJZSWVSyfN93vqHoGqOLd9u9mjhKBAl5v/TW4yWLNiIs+7o qrh20lHR8VT1w38CClPzLuMWZ4Mw5YWF1bACbdgA2NU4W+palRm5W7pQ4miLQYuP0C+7w8 qj4+dEjxvnKRLDmiOhFJAkHOZdVbFoI9bNXsGwRSRwIKUqqby60NCDJ4Ke70lOpsXxiFPS 2ViMvdK6bJCzlpcFUnEhhl5elwEiWGILLfG3MBUJwLFwj2iHP+VKqRLluECMishU4sxVnW X3jubhHqL9tMKi8iAOpSi30cmdM07lR9gsqvCBF2Im02jZOGnNi6ciC7KSQLbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668623474; a=rsa-sha256; cv=none; b=TdIZKrQEpJCOz2vsi2l4HQOCH27lOfVuuWONPAyarxMM2cBOZV50SmJyGzPWOTNSDct7pl 9voM/bOFg6GolaTZiKrgeYo6B6E+s5sx01GoIrZH8Fyp7N/Y8cv4MlqpcnKSIu+/Z+em21 dWBn2t8Djt7MOGBsPU3rBD7JwqsxsY/k0M1o2T4GGfyrRDVmGWqFctPe7JeCxmxCo6eVgG ZTmxw6kg+2E/YKe5VGo6ppidISiqAA2urAk9dYBl94Qh7Wh+gbb4klbxAn7kLQQH5ThzDx sa2LgMSTzIPmMdwYHsrLyb16nkaAc6WScHk6nJzbOgfIZBm/K27eU3ov6mh4Rg== 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 4NCBSy4zcKz1BpB; Wed, 16 Nov 2022 18:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AGIVESb044852; Wed, 16 Nov 2022 18:31:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AGIVEaD044851; Wed, 16 Nov 2022 18:31:14 GMT (envelope-from git) Date: Wed, 16 Nov 2022 18:31:14 GMT Message-Id: <202211161831.2AGIVEaD044851@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 61b146ba43cd - main - Check alignment of fp in unwind_frame List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61b146ba43cd3886c81e79b37fdc665d6e1d74b8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=61b146ba43cd3886c81e79b37fdc665d6e1d74b8 commit 61b146ba43cd3886c81e79b37fdc665d6e1d74b8 Author: Dapeng Gao AuthorDate: 2022-11-16 18:29:28 +0000 Commit: Brooks Davis CommitDate: 2022-11-16 18:29:28 +0000 Check alignment of fp in unwind_frame A misaligned frame pointer is certainly not a valid frame pointer and with strict alignment enabled (as on CHERI) can cause panics when it is loaded from later in the code. This is a recommit of 40e0fa10f58d90744c2857b57adf0ddbce1a1e1c with is_aligned() corrected to __is_aligned(). Reviewed By: jhb Differential Revision: https://reviews.freebsd.org/D34646 --- sys/arm64/arm64/unwind.c | 3 ++- sys/riscv/riscv/unwind.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/unwind.c b/sys/arm64/arm64/unwind.c index 470b64c00540..32590da5fc46 100644 --- a/sys/arm64/arm64/unwind.c +++ b/sys/arm64/arm64/unwind.c @@ -41,7 +41,8 @@ unwind_frame(struct thread *td, struct unwind_state *frame) fp = frame->fp; - if (!kstack_contains(td, fp, sizeof(uintptr_t) * 2)) + if (!__is_aligned(fp, sizeof(fp)) || + !kstack_contains(td, fp, sizeof(fp) * 2)) return (false); /* FP to previous frame (X29) */ diff --git a/sys/riscv/riscv/unwind.c b/sys/riscv/riscv/unwind.c index 9efb1fef9451..175e6423a59c 100644 --- a/sys/riscv/riscv/unwind.c +++ b/sys/riscv/riscv/unwind.c @@ -47,7 +47,8 @@ unwind_frame(struct thread *td, struct unwind_state *frame) fp = frame->fp; - if (!kstack_contains(td, fp - sizeof(fp) * 2, sizeof(fp) * 2)) + if (!__is_aligned(fp, sizeof(fp)) || + !kstack_contains(td, fp - sizeof(fp) * 2, sizeof(fp) * 2)) return (false); frame->sp = fp;