From nobody Mon Sep 18 14:53:25 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 4Rq78Q1Qtzz4tK3F; Mon, 18 Sep 2023 14:53: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 4Rq78Q0gqsz4dnt; Mon, 18 Sep 2023 14:53:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695048806; 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=JYngVSsj0Eh4AGJiVshLa8SgVFXZHC8PFgkTASSsggQ=; b=pDWXnR1ISTMkwpEAidh8kkh5NDihbJdgCsKtBr/uMxK8jcoDtwj/ETPu8yIVcCNaS4Dq/W MSOXCgqtGL0OCNokV3wZjmlMJE9D3Vtu/8NWrWGlJulFZ+pkIbWfKzUwdGZUsCwrbL1Tzz TEvS6ztCWP7IoFD6rbcMJvZSVqL1h3ImLKiaCtK5XesJlSwID7cwHgh8qQfL5PlDbBRoRz OKUEqVDj0In4M6kjX6oVAdtngNJDDgxi9So7yGqy5b2JoVgcrGR7nBsW9gfYXKJsLw5bIb T3X8ywSaSP/4h2x9hcYpGetSdTJACLrlahQ4CDqBc3vMTBnUOFgOTmpMcfh8DA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695048806; a=rsa-sha256; cv=none; b=FeYEzxg4uOi+DR4wR+G8VA1yxdJ5jMg502EzGfSZ5MfkXPurYfAoiVB92dPg0CCKOK3BMp dW5qJBmTPhjvrWZoF7E4wy8DGysR5mLVA8bXdM1Gy38nliPzoVO1vEb1ClMzt/zNZztkHs QHeNCvIKcF6SfYZYdjhT5bAMQpmNt3x8rjAAI476pJlBwGgldk/QjiXoOy3ExCJH5SXoO7 oZDv4xNHwc+Wc5AH10d5yBsjB9srEFIILymRYGsX6XucuMBhh2mN8UCH57ouJKaxJLlkHF o1jdGblEmHgB7TPLxhiAflOjzAFGVRsBlDsshiqUqzxbdUz+8K5psz1jw4rhQQ== 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=1695048806; 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=JYngVSsj0Eh4AGJiVshLa8SgVFXZHC8PFgkTASSsggQ=; b=QL8yN8+jQNfzhTLvlrD0L1ZeeuPua1cVu/gyfRzBBTt6vXyJb0Ebxc6jqJUnx7i8n39V0x p40n0aHrQg9GFWTWq66jfFVLDbqQ8X/dZ0Xsstyr1sP7NdiKl+aDsIXKfKrAte3r/D3RxY 2O5z8isidsEkScOET2pezhA1yafYswALRc3VtT9QasK5OAfFfPGHGKKaVey3fGI/fmBFTH U6ydw8gHNtmr1WTjMoSMR0734O6O5Zg92uu4cCBoXJJvr/xjFKa61mjk7Lye/Xxr9vHplZ si1trwJMng0xIdMYSd0aAqywVcrifzTw//bEWfkzBDcsy3c874NTzNAGdH5lSg== 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 4Rq78P6rXHzbFw; Mon, 18 Sep 2023 14:53:25 +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 38IErP02046042; Mon, 18 Sep 2023 14:53:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IErP3M046039; Mon, 18 Sep 2023 14:53:25 GMT (envelope-from git) Date: Mon, 18 Sep 2023 14:53:25 GMT Message-Id: <202309181453.38IErP3M046039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 227d01c1bc7c - main - linux(4): On Linux SIGKILL can not be reset to default 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 227d01c1bc7caf2e838ee6eef1e6a3cc81d79d1b Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=227d01c1bc7caf2e838ee6eef1e6a3cc81d79d1b commit 227d01c1bc7caf2e838ee6eef1e6a3cc81d79d1b Author: Dmitry Chagin AuthorDate: 2023-09-18 14:53:01 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-18 14:53:01 +0000 linux(4): On Linux SIGKILL can not be reset to default MFC after: 1 week --- sys/compat/linux/linux_signal.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c index e3e3fc74a6a9..9a84700b3949 100644 --- a/sys/compat/linux/linux_signal.c +++ b/sys/compat/linux/linux_signal.c @@ -170,6 +170,7 @@ linux_do_sigaction(struct thread *td, int linux_sig, l_sigaction_t *linux_nsa, if (!LINUX_SIG_VALID(linux_sig)) return (EINVAL); + sig = linux_to_bsd_signal(linux_sig); osa = (linux_osa != NULL) ? &oact : NULL; if (linux_nsa != NULL) { @@ -180,9 +181,11 @@ linux_do_sigaction(struct thread *td, int linux_sig, l_sigaction_t *linux_nsa, linux_ktrsigset(&linux_nsa->lsa_mask, sizeof(linux_nsa->lsa_mask)); #endif + if ((sig == SIGKILL || sig == SIGSTOP) && + nsa->sa_handler == SIG_DFL) + return (EINVAL); } else nsa = NULL; - sig = linux_to_bsd_signal(linux_sig); error = kern_sigaction(td, sig, nsa, osa, 0); if (error != 0)