From nobody Sun Oct 04 00:34:22 2026 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 4hy3S40njGz4Tnvf for ; Sun, 04 Oct 2026 00:34:28 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hy3S354m1z4HH3 for ; Sun, 04 Oct 2026 00:34:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791074067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EQv2UrhAFnfag9p47ZUWLe2wy29P+HxK81hV3vWKYrc=; b=BFycz6EquRL46TPSIb0FA4mX8/P0LP9q6y7mK45oUpdkMwI2O75OzXidB2L57IAZIJA06m zTBUgX4RgeiOlKYqHpPwpnUgGzG/W3FEH1JAngAtCoWXohgwR+hnjLqmMUNJHGXFzj/VNK Aik7zBIBrmfLmPCAS+KZZEl5i4YyDssic1MESHKtegoJfTBQb1SD5+jZnnWUPB2a+x4tFP LOVT7EWneKi7NbRDgWOMmDaTKXNlZnEMWaBQ6ykNUiGiNu9qcNxn+n4kokNfxb/FsQYy87 6GgiSWl9H7CJD/0psv0eWNTh/F+9JK4VcKb+kTRYuLkiUhyLoCWiqnLX8/ZBeA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791074067; b=E6KipRINsixqORNMI6D8nLAphn4ax3A5lsZCkb2PEbw7Aq54TMj+hgqfWLfBvTa2x891kj ChFsM+OsqSVaMRdeZLcKHF8q3V4QD23q61Mt76v9xXXnWX1bw2z6/i1O5zsv3Rn/hClkZs opWWB+U7LvbGc6fKK0x4MpmM0gmBk6r/EYP1iwCVJS3RbXTS7v6xcPQDqbHCTGm0nGm1Y1 neqs180lZg266xRHGhuC01X7KzEuMV8tU9J9Ml4E9C0XHP+tcHsllHP+RcIgzFrKKQMqCN AJu2nguL6WHsIEcm8WAILyFwtRCoOwKRBqSX5GG5lZZKrNcJ2BZ/JlRvbK38ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791074067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EQv2UrhAFnfag9p47ZUWLe2wy29P+HxK81hV3vWKYrc=; b=d5KFexmZvLZi0Cg7mxVcejR9hyMLI+J/Sjd1zTZ52qRDFFRTabC554BQSI+QWrzZIbKKN9 rrKV7Lstd+EfC+PVG7ygzV6P/x4qtWndZQp4bBwQ5xK6jWtAPz5lHtCeYCnfviIAcwFaUR YHVs+Y1muE+qxN3JNsZMbZHGSgc6aeH85aZ3FH8WvQAwDFJosTlyFL5tAz6o0tnJgIc/w7 pIAqsQiiLJXnx1oVrINnGFiH5+sFTa5/VOyWw/ZYQnpTXxRHcjyQNGNFqlFx3qQlMNQ/W8 mFkrYMINeynnEKcZr4TFOSknLJeZ7pT5pL9N5sL18Y2p6/1TzgzWX5FZUUneQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hy3S33sl6z1Q3Y for ; Sun, 04 Oct 2026 00:34:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31bed by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Oct 2026 00:34:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Grzegorz Junka From: Konstantin Belousov Subject: git: 0143078248bb - stable/15 - linux(4): Fix signal mask restoration in epoll_pwait(2)/epoll_pwait2(2) 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0143078248bb4caf39f23c9075b2afbede52e70d Auto-Submitted: auto-generated Date: Sun, 04 Oct 2026 00:34:22 +0000 Message-Id: <6ac19f0e.31bed.6efc3bca@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0143078248bb4caf39f23c9075b2afbede52e70d commit 0143078248bb4caf39f23c9075b2afbede52e70d Author: Grzegorz Junka AuthorDate: 2026-09-27 19:22:20 +0000 Commit: Konstantin Belousov CommitDate: 2026-10-04 00:33:40 +0000 linux(4): Fix signal mask restoration in epoll_pwait(2)/epoll_pwait2(2) PR: 298878 (cherry picked from commit 16a284b1cdfd45ba99c2723e7f88497e76b235ad) --- sys/compat/linux/linux_event.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c index fc3ef7c3e90a..de313aefff97 100644 --- a/sys/compat/linux/linux_event.c +++ b/sys/compat/linux/linux_event.c @@ -376,7 +376,6 @@ linux_epoll_wait_ts(struct thread *td, int epfd, struct epoll_event *events, NULL}; cap_rights_t rights; struct file *epfp; - sigset_t omask; int error; if (maxevents <= 0 || maxevents > LINUX_MAX_EVENTS) @@ -392,16 +391,10 @@ linux_epoll_wait_ts(struct thread *td, int epfd, struct epoll_event *events, } if (uset != NULL) { error = kern_sigprocmask(td, SIG_SETMASK, uset, - &omask, 0); + &td->td_oldsigmask, 0); if (error != 0) goto leave; td->td_pflags |= TDP_OLDMASK; - /* - * Make sure that ast() is called on return to - * usermode and TDP_OLDMASK is cleared, restoring old - * sigmask. - */ - ast_sched(td, TDA_SIGSUSPEND); } coargs.leventlist = events; @@ -420,9 +413,19 @@ linux_epoll_wait_ts(struct thread *td, int epfd, struct epoll_event *events, if (error == 0) td->td_retval[0] = coargs.count; - if (uset != NULL) - error = kern_sigprocmask(td, SIG_SETMASK, &omask, - NULL, 0); + if (uset != NULL) { + /* + * Make sure that ast() is called on return to usermode and + * TDP_OLDMASK is cleared, restoring the old sigmask from + * td_oldsigmask. As on Linux, if we were interrupted, deliver + * the signal with the temporary mask in place; otherwise + * restore the old mask before any signal can be delivered. + */ + if (error == EINTR) + ast_sched(td, TDA_SIGSUSPEND); + else + ast_sched(td, TDA_PSELECT); + } leave: fdrop(epfp, td); return (error);