forked from mirrors/nixpkgs
25 lines
986 B
Diff
25 lines
986 B
Diff
|
Backported to Qt 5.6 for epoll_pwait fix on newer glibc
|
||
|
|
Part of upstream Chromium's 4e8083b4ab953ba298aedfc4e79d464be15e4012
|
||
|
|
Review URL: https://codereview.chromium.org/1613883002
|
||
|
|
---
|
||
|
|
diff --git a/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||
|
|
index 10278dc5fc9b..b30b3e6acef6 100644
|
||
|
|
--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||
|
|
+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||
|
|
@@ -414,6 +414,7 @@ bool SyscallSets::IsAllowedEpoll(int sysno) {
|
||
|
|
case __NR_epoll_create:
|
||
|
|
case __NR_epoll_wait:
|
||
|
|
#endif
|
||
|
|
+ case __NR_epoll_pwait:
|
||
|
|
case __NR_epoll_create1:
|
||
|
|
case __NR_epoll_ctl:
|
||
|
|
return true;
|
||
|
|
@@ -421,7 +422,6 @@ bool SyscallSets::IsAllowedEpoll(int sysno) {
|
||
|
|
#if defined(__x86_64__)
|
||
|
|
case __NR_epoll_ctl_old:
|
||
|
|
#endif
|
||
|
|
- case __NR_epoll_pwait:
|
||
|
|
#if defined(__x86_64__)
|
||
|
|
case __NR_epoll_wait_old:
|
||
|
|
#endif
|