Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177636555
D60005.1794911890.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None
D60005.1794911890.diff
View Options
diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c
--- a/sys/compat/linux/linux_event.c
+++ b/sys/compat/linux/linux_event.c
@@ -376,7 +376,6 @@
NULL};
cap_rights_t rights;
struct file *epfp;
- sigset_t omask;
int error;
if (maxevents <= 0 || maxevents > LINUX_MAX_EVENTS)
@@ -392,16 +391,10 @@
}
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,17 @@
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 old
+ * sigmask.
+ */
+ if (error == EINTR)
+ ast_sched(td, TDA_SIGSUSPEND);
+ else
+ ast_sched(td, TDA_PSELECT);
+ }
leave:
fdrop(epfp, td);
return (error);
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, Nov 17, 10:38 AM (41 m, 31 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
39635013
Default Alt Text
D60005.1794911890.diff (1 KB)
Attached To
Mode
D60005: linux(4): save the epoll_pwait signal mask in td_oldsigmask
Attached
Detach File
Event Timeline