From nobody Mon May 30 17:04:18 2022 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 F14FE1B60716; Mon, 30 May 2022 17:04:18 +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 4LBhb65r9Tz4kLl; Mon, 30 May 2022 17:04:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653930258; 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=mtepCJvo7b8xIF846CA/O55PqvHhOmTwsUtdBVl1B84=; b=JtRfsNmIvk5YYwFXYSTzccselcXmDdP+RJXawPFBfxSGe+G7q7HHPVvTeGtcGEhOe+qweQ IzQI1hdTISfpKYxPbN0rnpCs9e5FNL3UK+YL+1Z8O1ltcNWyVoD6x/V98UvJSA/3JAVqpq j/9HqlD4lA9LGSfPCF3hTHv+gkYvSIYknK4hQOmdAHd79bddbaGtMp5gZOQ7h6Jm42inSp wMjmuze5TNdD7EMLA1EDnm0wwuAMmBLL7+SIFlFdOJ7k6cl+yd0fQTkdz2LVabnGn4LKoh frOSfdTKNJlR1P90q28QEEdRjaJy1fiA9mmxgQ6uLAiY9XeY4+o0cl2/M26LWA== 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 A8D671B491; Mon, 30 May 2022 17:04:18 +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 24UH4IXZ067803; Mon, 30 May 2022 17:04:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24UH4Iix067802; Mon, 30 May 2022 17:04:18 GMT (envelope-from git) Date: Mon, 30 May 2022 17:04:18 GMT Message-Id: <202205301704.24UH4Iix067802@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: 2ab9b59faafb - main - linux(4): Avoid direct manipulation of td_sigmask 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: 2ab9b59faafb68402dbebc285b424cfb06b59cf3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653930258; 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=mtepCJvo7b8xIF846CA/O55PqvHhOmTwsUtdBVl1B84=; b=hDbmrGYzDapFoG1y+yc+woH61vhWDKqYGqMt1Q5axQrxvF2pey2Gnwbn0JBrYBRt5UPwWI txBUOhzBqWEOlLuk46P6k580WgO7F700uir7Z+z18IJ4/2KMIORWRU49Y3Jdo09WMkC1CC Nc77WUuTO2RQEeqMNzeXZSzqkkZZHflS/zruSBMaQqrI2s85bp+uo7MGmwc0sLlMpE9Lbl bRVUEjUVFBK+LUNBPEMjjIRLdfuCJyy5FnPhwRb9qVtkFue6/AmnNTLM0rsTHymAfnqAMy 3sYLp2MGvuDv1fv/5FJZO7DnV2svvOat+ux9gUZOQl3r21OJK9ukcgiXv2fs+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653930258; a=rsa-sha256; cv=none; b=Cf3AP1Ho0OcYTJZC2oufmWy/BTn44Llq5i1eV0vZ9UDfGy8pJo1zAt35HD+fWT8eRW7mxs +lyqr8po88n0L9UJ+ROrMav7TdLJ19jYh0KgUXgYhRBa3uICyP7HVqnZ/1bcy1CBT0Xdf8 28f/15v93cio+xKhBZ4//gCmJNFKWX877n6cGpI7is54yEybBKXP6VPUDouWAFPX1lJ1Qj OmN5jSSu4nxhj9eTwehgJGNlqK/tbKvIiWb9lHbnpghVGkaQrCRUAEVeP/WAGOEP90tqEv DsZL4d8aSpXj5vVExP1BMJBCLITTp8V/KFVZVgWn64HlRtQyH2nKqMp0yVpHyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=2ab9b59faafb68402dbebc285b424cfb06b59cf3 commit 2ab9b59faafb68402dbebc285b424cfb06b59cf3 Author: Dmitry Chagin AuthorDate: 2022-05-30 16:48:20 +0000 Commit: Dmitry Chagin CommitDate: 2022-05-30 16:48:20 +0000 linux(4): Avoid direct manipulation of td_sigmask Use kern_sigprocmask() instead of direct manipulation of td_sigmask to reschedule newly blocked signals. MFC after: 2 weeks --- sys/amd64/linux/linux_sysvec.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c index acfc4d6831f3..7aa2cfc1b30e 100644 --- a/sys/amd64/linux/linux_sysvec.c +++ b/sys/amd64/linux/linux_sysvec.c @@ -466,6 +466,7 @@ linux_rt_sigreturn(struct thread *td, struct linux_rt_sigreturn_args *args) struct l_sigcontext *context; struct trapframe *regs; unsigned long rflags; + sigset_t bmask; int error; ksiginfo_t ksi; @@ -514,11 +515,8 @@ linux_rt_sigreturn(struct thread *td, struct linux_rt_sigreturn_args *args) return (EINVAL); } - PROC_LOCK(p); - linux_to_bsd_sigset(&uc.uc_sigmask, &td->td_sigmask); - SIG_CANTMASK(td->td_sigmask); - signotify(td); - PROC_UNLOCK(p); + linux_to_bsd_sigset(&uc.uc_sigmask, &bmask); + kern_sigprocmask(td, SIG_SETMASK, &bmask, NULL, 0); regs->tf_rdi = context->sc_rdi; regs->tf_rsi = context->sc_rsi;