From nobody Tue Feb 22 16:40:25 2022 X-Original-To: dev-commits-src-branches@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 A516119E0B68; Tue, 22 Feb 2022 16:40:26 +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 4K34fK5Mwlz3KNr; Tue, 22 Feb 2022 16:40:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645548025; 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=a5dUqxZP9yYlgHfBUJc0jU4Imn5r70qT6UoPijooucs=; b=wkvUWLHHcol13fNuymUQ8zPJeWW0ex4nA8k6tkBrzG9opJYJhkloFH58fMRpr01ykUmAlM uJ4m1c4TuZtTmCwanueaU5OP3yxzKZcmOa8GIA+SoIof4W+RFbMn1yQrC9AfGXsjFsuSs/ KuJpeEUTnRcx2eqrho3ef9QpfqvoyUHXVpSzBwToqJG2jYv8u6E8YAHtnWewIGXCVj2RVC rt1JheFMeY0ngQCZ/gBe65qJ5XtsVnPPg4TXg+/trb9cFx6dGMLsbBt+F3oOV9BX8Yxc15 n1CxQVNNlaVYg2RGfR3wCn4D6bQiyHa1ImBsm3xJK3IwfHDmyr923SZmp4FCCA== 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 6EFDD277FC; Tue, 22 Feb 2022 16:40:25 +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 21MGePY0063895; Tue, 22 Feb 2022 16:40:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21MGePba063894; Tue, 22 Feb 2022 16:40:25 GMT (envelope-from git) Date: Tue, 22 Feb 2022 16:40:25 GMT Message-Id: <202202221640.21MGePba063894@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 4b8f747b9d31 - stable/13 - Fix the signal code on 32-bit breakpoints on arm64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4b8f747b9d31b546cf59fac10878f1104e57f25e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645548025; 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=a5dUqxZP9yYlgHfBUJc0jU4Imn5r70qT6UoPijooucs=; b=figPQIe6PCLgUqrh9f8GcuoLN3rApHYnqWRDTzDCcFSqxrdXxeH5ncawRQntfHLqineEPF 6aLVwDeHutceRikmWy79MLH7Ufs/BLR0r0Hp2sdRmyiG2GYmdbe0v8q3y1zr7ip8613kFw YcxQhdTlEDeoWCjR6QqqzKjHqa9WJenOjDcv0GUe4j9FBK3mivnB5rBaEDCmR5ebAqzmeP NNy1S9FLQEC8xgMKnzu3f4ilh9z2c7ofs4JP3gdaoxURxgDWyrxr3xEbkEHePdVThqLPev gfGX6+ydqlUel7Qag+UFqzj1I2aBrWrUoBRBFDHqlU0tH4T9Pt01HhKwgBfz6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645548025; a=rsa-sha256; cv=none; b=rBcxpNDiwOMuD3uyTsCUob2ICvlGoCSAnXTycuLsE6ACypsaMvileYse2rCg0sOcwtpOOf SnKwNyDnfneuoMO9VkeDEP362MJ5Xv5YmlUXRL23GHVc+3+4AOKHoe6+uGu8jf19W4QAW4 3QzqzpX8ZulH6JGCC6kH65zyDzixfHFhAmE70LFE8ybyoWPTxCHhbGCcwemlemB0tCjrz9 uwwVdxCCrBux0eyV9GqrpLunxjuqLWU7/j4iN9UfO19qnDk1sbelvHylQ78gP6IGR3RyW6 o3SSiv57OCHfmY20Eggi8uhs4NsRiC1DUSWb9Mz32CBCeFsG6zu0Jqd4aakW6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4b8f747b9d31b546cf59fac10878f1104e57f25e commit 4b8f747b9d31b546cf59fac10878f1104e57f25e Author: Andrew Turner AuthorDate: 2022-02-07 11:47:04 +0000 Commit: Andrew Turner CommitDate: 2022-02-22 16:23:07 +0000 Fix the signal code on 32-bit breakpoints on arm64 When debugging 32-bit programs a debugger may insert a instruction that will raise the undefined instruction trap. The kernel handles these by raising a SIGTRAP, however the code was incorrect. Fix this by using the expected TRAP_BRKPT signal code. Sponsored by: The FreeBSD Foundation (cherry picked from commit 67dc576bae6e624ae46962ad187e0e31fece6688) --- sys/arm64/arm64/undefined.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/undefined.c b/sys/arm64/arm64/undefined.c index 2cdb5f9a97fb..1feb242db060 100644 --- a/sys/arm64/arm64/undefined.c +++ b/sys/arm64/arm64/undefined.c @@ -105,7 +105,7 @@ gdb_trapper(vm_offset_t va, uint32_t insn, struct trapframe *frame, ksiginfo_init_trap(&ksi); ksi.ksi_signo = SIGTRAP; - ksi.ksi_code = TRAP_TRACE; + ksi.ksi_code = TRAP_BRKPT; ksi.ksi_addr = (void *)va; trapsignal(td, &ksi); return 1;