From nobody Mon Sep 18 21:05:42 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 4RqHQ90GFPz4tlW3; Mon, 18 Sep 2023 21:05:53 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4RqHQ83347z4Rbp; Mon, 18 Sep 2023 21:05:52 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.17.1/8.17.1) with ESMTPS id 38IL5g3L099545 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Tue, 19 Sep 2023 00:05:45 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 38IL5g3L099545 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 38IL5gVG099544; Tue, 19 Sep 2023 00:05:42 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 19 Sep 2023 00:05:42 +0300 From: Konstantin Belousov To: Dmitry Chagin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 227d01c1bc7c - main - linux(4): On Linux SIGKILL can not be reset to default Message-ID: References: <202309181453.38IErP3M046039@gitrepo.freebsd.org> 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=us-ascii Content-Disposition: inline In-Reply-To: <202309181453.38IErP3M046039@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4RqHQ83347z4Rbp On Mon, Sep 18, 2023 at 02:53:25PM +0000, Dmitry Chagin wrote: > 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); This is excessive: look at kern_sigaction() around line 822. > } else > nsa = NULL; > - sig = linux_to_bsd_signal(linux_sig); > > error = kern_sigaction(td, sig, nsa, osa, 0); > if (error != 0)