From nobody Tue Jan 31 01:47:14 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 4P5SbQ65Svz3c3Zd; Tue, 31 Jan 2023 01:47: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 4P5SbQ5bX1z4l1Z; Tue, 31 Jan 2023 01:47:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675129634; 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=BOXY2CD3dsdlHVFGFqMh7U9kbBE8KhBNsn5vPgXl7Kg=; b=F1jAPODKeole5W82DCJzHvFmDkY0ke/rgXq2d2HzkmezmKq1T9xqa0wClIpfx92/fI5ga2 TvXthPZ6xqZt7RlNwVUrvJ82BgARNXKS8tkG2/F28NZOU1CnolpRHq5Op20TyYp02vGjdZ XVZ3gDPimiwv1BkTUqGvlD0t+9rSCt4wzENixGt27WHCYS2AkMkdq5xRLKdAqx/OxylneV zUgK0jCYnb4Zj3DTe3kwNV78mknhSibYkmOYn+z0pTLUsetcDwpFvPu8MW6puPKB0QAl5H 6Zk0UQE4IAWeBITBTuq5HKvlT5h7MeZijQg/R8MGG87fN7jY1XpgnGIMl67OBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675129634; 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=BOXY2CD3dsdlHVFGFqMh7U9kbBE8KhBNsn5vPgXl7Kg=; b=YJoCgBdVNUBB9OPjmlaE6kijKfg4NRNXUP4EAB/NLzcnY05ERihsvlONXIrk7ZMNwDqE7Z xTzWmMH0aKiKQRj3Geof9iY93STdjM+NOnVLeyn2PiWcfkXSmlNx4sxZWsa3aVQf3BE3ZO sq1Ben8s0Rg1ppnUGLnGqVhHxlY9ynTKD1XkcWGwSO1LApivKDDz42oZRcAUCNwiNuMzY9 o1vSqsWCc0CqQGXlr/oEOVew9LuyCNjE/8z0m7qPQ479Ad4s+op+WIP7QK47KIBBujmdHB rwJFi3Mn2CDmKMOxxheqw/GFaZXJGFxjgxeN9gnvN6gsxFd4byICozWiUVfWwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675129634; a=rsa-sha256; cv=none; b=xs5uS0B7ec2IITU0co4nC4B8tQUMk3zrLl7LO/Jp9o9ikSQ6TT8NDVEaJyiYIvdyMvMdqz E8/zle5Pea59g8hZ/YHa6KcB01RjnDYV+ravZU2UYm0OCrv6l6YlnWcTmyUDZl7LbTbo6g 8PrWSVlXKAt5nVO4MOOI1isWPfQbBnEDgRq8pCRtFTvna9AFTmqxATInV03usgJKesgXV3 mTuLxj6D3R4zgdBA6OOxNIL2kXVB7nggXHCoe8cR82vF5Ychef03pG+d5T4JV+l4dZi2r4 En3K/Rlk9QqV1UokdUP3iijwrtRaikuRnQv2utf3U8NM2+n/PrtVHqGbeIHDOg== 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 4P5SbQ4jc5zWHV; Tue, 31 Jan 2023 01:47: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 30V1lEEf058713; Tue, 31 Jan 2023 01:47:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V1lEHr058712; Tue, 31 Jan 2023 01:47:14 GMT (envelope-from git) Date: Tue, 31 Jan 2023 01:47:14 GMT Message-Id: <202301310147.30V1lEHr058712@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: d00a638bfd66 - stable/13 - mips: Fix sendsig for stack layout randomisation 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d00a638bfd668fea9608fa14cbcea3df783e9be5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=d00a638bfd668fea9608fa14cbcea3df783e9be5 commit d00a638bfd668fea9608fa14cbcea3df783e9be5 Author: Jessica Clarke AuthorDate: 2023-01-31 01:27:50 +0000 Commit: Jessica Clarke CommitDate: 2023-01-31 01:46:18 +0000 mips: Fix sendsig for stack layout randomisation PS_STRINGS doesn't account for the stack gap, we need to use the new PROC_PS_STRINGS macro to correctly point at the trampoline. This is a direct commit to stable/13 as mips no longer exists in main. Fixes: d247611467e0 ("exec: Introduce the PROC_PS_STRINGS() macro") --- sys/mips/mips/pm_machdep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/mips/mips/pm_machdep.c b/sys/mips/mips/pm_machdep.c index 7a9db29b6ff6..9fcbef14f606 100644 --- a/sys/mips/mips/pm_machdep.c +++ b/sys/mips/mips/pm_machdep.c @@ -175,7 +175,8 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) /* * Signal trampoline code is at base of user stack. */ - regs->ra = (register_t)(intptr_t)PS_STRINGS - *(p->p_sysent->sv_szsigcode); + regs->ra = (register_t)(intptr_t)PROC_PS_STRINGS(p) - + *(p->p_sysent->sv_szsigcode); PROC_LOCK(p); mtx_lock(&psp->ps_mtx); }