From nobody Mon Apr 08 20:25:40 2024 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 4VD0w44kXDz5Hj1d; Mon, 8 Apr 2024 20:25:40 +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 4VD0w42lFyz3xL0; Mon, 8 Apr 2024 20:25:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712607940; 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=F13VIpALjRbYc5SuA/D0m+A8cpRWSgQdav02M/Xs+Gc=; b=I6m/UpxepXUh6qFb+XV0L3EWPQd+Tn0rmPgfLuRqKLYSWpTo4Icn0ZIh9XmszEWBUdNFMT VKW3ilEGRSzYk6Kk0s/u1yaFfuTaFjuJb2gnN1vo3xsARDQkrKtMbwMi23+/k7hkB+PJ2y W0EfMJyCaBIuyUsIfKSSAh2xfm4YBTFkcFjB0MbyaUjYHUdOtFx8K1/EuvTsmWIY8/pqem lfs3vD+x2P99/Km1f2TYx6XpYq2B4ikuFs2jFWPYyaZyVTutdSQfUISH8bNCk+3X58GP0k m3vVln/YLU3x3NxOvq4FoIHZ3HJnx7+/G8O9CmSBhF7YBVRiVJCRbnNX6Tfp7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712607940; a=rsa-sha256; cv=none; b=ttUb2OKSCVOUhomZzafpKZ9XOUdFRUct/gxtXP4v5WRzCZTQHywmHylbAV/K7NTly+NYNX Nf+S07mL1IqELwbXdrvUuO45bVNV847QHyIiNlpk/0gU/CfnH4OxUyGVxzMFI5YJ7nPI3R RKHIZc/UE+a+s7WJylIzE3uEbDWutDFn+MwSzp4cIswc720BVkXJL69dCrYL6V7UmAqyuW t0b9198j9hGx60DIyiowrOQhYLhctFoYfFtHNc39FHYF2hamFhWwAlNOBc879s03yslzT8 lvy/4+iN7UBLo/tRf4ENNi2QJkkba/zw0b/3hwY4hUSDYarcmyTglFuGA4Yu8w== 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=1712607940; 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=F13VIpALjRbYc5SuA/D0m+A8cpRWSgQdav02M/Xs+Gc=; b=XI3TvWYd7g1YeygATeKcIa4J2Y74A8UUdlk87WwALS4y7DL1MlNOxrVOJno+vdO6JStdVN jMnhgWtPenPY4aq69j4xVlijNFwz4BAkkZltFNiz5ZQG7yWCw1mmcz4fiSM+WfXyIuzyd1 +o7HyFVKyWO85DgtmOFXZ5/fMRBCuRFF56tIIpbh460mRkuIvZb6b11lgY7UBgWuhYwNtK P4nmSCWz7+JGMVy5OqnVFQkXl+JvGRZ/XCTFQyDHej/b7f7ezgwyN85t8jF3PqWuQtJz7Z cv5Ae7PAiQt8Kpyql7Saxms9LY2qThJ3FZ8j6/vgkuyM1FwLSM8MN2jXEcFHow== 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 4VD0w42M4FzQRt; Mon, 8 Apr 2024 20:25:40 +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 438KPeHI039424; Mon, 8 Apr 2024 20:25:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 438KPe4E039421; Mon, 8 Apr 2024 20:25:40 GMT (envelope-from git) Date: Mon, 8 Apr 2024 20:25:40 GMT Message-Id: <202404082025.438KPe4E039421@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: 2bc1e37e1d83 - stable/13 - Stop using expressions in _Alignof() 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/13 X-Git-Reftype: branch X-Git-Commit: 2bc1e37e1d83392e1552616d5c17f49d79e52eda Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2bc1e37e1d83392e1552616d5c17f49d79e52eda commit 2bc1e37e1d83392e1552616d5c17f49d79e52eda Author: Minsoo Choo AuthorDate: 2024-01-12 23:37:53 +0000 Commit: John Baldwin CommitDate: 2024-04-08 17:30:09 +0000 Stop using expressions in _Alignof() _Alignof(expression) is a non-standard extension. This is not allowed in gnu11 and gnu17 which follow the C11 standard _Alignof(type). Reviewed by: arichardson, imp, jhb Fixes: 4a9cd9fc22d7 amd64 db_trace: Reject unaligned frame pointers Fixes: 7ccaf76a27f1 riscv db_trace: Ensure trapframe pointer is suitably aligned. Fixes: 638c68897fbd arm64 db_trace: Ensure trapframe pointer is suitably aligned. Differential Revision: https://reviews.freebsd.org/D43409 (cherry picked from commit 03d04bf49492fc70366e6d78194336a4122282a2) --- sys/amd64/amd64/db_trace.c | 3 ++- sys/riscv/riscv/db_trace.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c index 87a0c2aec7bf..9706e65c64af 100644 --- a/sys/amd64/amd64/db_trace.c +++ b/sys/amd64/amd64/db_trace.c @@ -206,7 +206,8 @@ db_nextframe(db_addr_t *fp, db_addr_t *ip, struct thread *td) */ tf_addr = *fp + 16; - if (!__is_aligned(tf_addr, _Alignof(*tf)) || !INKERNEL(tf_addr)) { + if (!__is_aligned(tf_addr, _Alignof(struct trapframe)) || + !INKERNEL(tf_addr)) { db_printf("--- invalid trapframe %p\n", (void *)tf_addr); *ip = 0; *fp = 0; diff --git a/sys/riscv/riscv/db_trace.c b/sys/riscv/riscv/db_trace.c index 12972839c29d..148ad88b3ffb 100644 --- a/sys/riscv/riscv/db_trace.c +++ b/sys/riscv/riscv/db_trace.c @@ -84,7 +84,7 @@ db_stack_trace_cmd(struct thread *td, struct unwind_state *frame) struct trapframe *tf; tf = (struct trapframe *)(uintptr_t)frame->sp; - if (!__is_aligned(tf, _Alignof(*tf)) || + if (!__is_aligned(tf, _Alignof(struct trapframe)) || !kstack_contains(td, (vm_offset_t)tf, sizeof(*tf))) { db_printf("--- invalid trapframe %p\n", tf);