From nobody Fri Jun 17 19:38:33 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 3FA1F85B70B; Fri, 17 Jun 2022 19:38:35 +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 4LPq8p5DKfz3Qcs; Fri, 17 Jun 2022 19:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494715; 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=d5YSBpl0e5IVXYj4zATjlf3rsIX4ypJp6/DVR5+/o84=; b=wWD6rgBJNAHF3I0VyLZhiDzbmdlQ1eOlYJQPJ6fp4T2gQEmouVhm3qWusKjNjIZIrdSAdb LL6/Zh+W4dZrhCMHOiHqoV2QRsOFMdTCOl47bH4ILv/4SOfgZcEEvxv96BJ3XN7gXNodkR JFnztYgC2wyGS4EpGhbdy5EJkb6DiSt4m8scCFEyIyZAUKA089QAzp6eogWluZ/dLPOwdF WK77AfnHIlVQ6T3Hz5O7ua/fdScBUfJzX52tybR2dYG4VaP4AmnQkhbQwDeS6rAFKRplqy XsaqssVugtDmzckGI9rX+A7xMmQBMlXRs+UpkEkI6NwQO2VG2WTfj6/XosuZqg== 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 0196425A3F; Fri, 17 Jun 2022 19:38:34 +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 25HJcXB5014851; Fri, 17 Jun 2022 19:38:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJcX4q014850; Fri, 17 Jun 2022 19:38:33 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:38:33 GMT Message-Id: <202206171938.25HJcX4q014850@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: feb67d438ba3 - stable/13 - linux(4): Reduce diffs between linux_rt_sendsig() and sendsig() 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: feb67d438ba3c269a57414e2fd858fa729c46046 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494715; 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=d5YSBpl0e5IVXYj4zATjlf3rsIX4ypJp6/DVR5+/o84=; b=JsjA0WHCrkiNnw5ST9SxC93kjjyM6jRQS5I9ZxZLXcgBi3T1cGoATtF6m50S+wuUkQMfwO L1ZhGU2j/dls8DKFaBP5kKvxmhNKqWKXUqxjKrtLLA7P0l3/Gp9bhvdBGdoyAe19wAgdY7 OnFy+poZXm8NuZZvW7ezrDezMZ3JcPR12oAOmzkGiz0ulzBTi7CTcVT3MyA9ece6Wau3St M2tccJr/9DhupxD5mtavnkbagfVCHBRuu4w3Fu2aBM0WVGHhKVM+q2vU/qZ2D6NCNe9CBM HE+prr62mTRDj0UiBSNhUkt3bYTBwdRzOLX+ND4wbqJMkzf3NeQi+irkxGtdlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494715; a=rsa-sha256; cv=none; b=HI2EjnChoOLTA6c0bHlI0B/cAlEcMZUGQORgYg79N92RnjD74nX1ZvD1SOLMataxIEoQ9m vuJ+On+e/16RU0zid/+4zD679UMx/CZWGJguAmLAl4uHAVWIa1Jfbg0sd7CzSVQ+NgScQg nEV1qo4bxCE1uk0gn5aArRbbwsd/qDhkgjx4z2wC4SNwTiUNN3kCS8A0pgqfJdM+n1GVBt gzWXMJRR6fePGlTKBawa2FsFIn+LiGcQwQiuy+4P8OV47aiyuhClTws/CLYB2RVYjiSpVG LRgsGqGPFHE3oDPr5g4QIN7JXwyCh6Tc1Ut5Y9P3mdhoDp6IuB0u8wH3kmayeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=feb67d438ba3c269a57414e2fd858fa729c46046 commit feb67d438ba3c269a57414e2fd858fa729c46046 Author: Edward Tomasz Napierala AuthorDate: 2022-01-04 14:13:03 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:33:41 +0000 linux(4): Reduce diffs between linux_rt_sendsig() and sendsig() No functional changes (except for the uprintf). Discussed With: kib Sponsored By: EPSRC (cherry picked from commit f7b04c53de46b18785a153d9812e64ca1a9a8c8d) --- sys/amd64/linux/linux_sysvec.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c index 6bb2bc5c61ff..308f6529ad38 100644 --- a/sys/amd64/linux/linux_sysvec.c +++ b/sys/amd64/linux/linux_sysvec.c @@ -669,10 +669,10 @@ linux_rt_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) /* Allocate space for the signal handler context. */ if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sp = (caddr_t)td->td_sigstk.ss_sp + td->td_sigstk.ss_size - - sizeof(struct l_rt_sigframe); + sp = (caddr_t)td->td_sigstk.ss_sp + td->td_sigstk.ss_size; } else - sp = (caddr_t)regs->tf_rsp - sizeof(struct l_rt_sigframe) - 128; + sp = (caddr_t)regs->tf_rsp - 128; + sp -= sizeof(struct l_rt_sigframe); /* Align to 16 bytes. */ sfp = (struct l_rt_sigframe *)((unsigned long)sp & ~0xFul); @@ -694,6 +694,8 @@ linux_rt_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) /* Copy the sigframe out to the user's stack. */ if (copyout(&sf, sfp, sizeof(*sfp)) != 0) { + uprintf("pid %d comm %s has trashed its stack, killing\n", + p->p_pid, p->p_comm); PROC_LOCK(p); sigexit(td, SIGILL); }