From ed00c69c6b2a65ae692709557b1f7a0d6af4f1e9 Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Wed, 30 Jan 2019 23:47:21 +0000 Subject: [PATCH] MFC r340129, r340195, r340198 r340129: capsicum: allow ppoll(2) in capability mode We already allow to use poll(2). There is no reason to disallow ppoll(2). PR: 232495 Submitted by: Stefan Grundmann Reviewed by: cem, oshogbo r340195: capsicum: Add ppoll and freebsd32_ppoll to compat32. PR: 232495 Pointed out by: brooks r340198: Remove ppoll. freebsd32 doesn't define a ppoll syscall. Reported by: jhb --- sys/compat/freebsd32/capabilities.conf | 1 + sys/kern/capabilities.conf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/compat/freebsd32/capabilities.conf b/sys/compat/freebsd32/capabilities.conf index 41eb3c506ec..12272c4bd25 100644 --- a/sys/compat/freebsd32/capabilities.conf +++ b/sys/compat/freebsd32/capabilities.conf @@ -204,6 +204,7 @@ pdkill freebsd32_pipe pipe2 poll +freebsd32_ppoll freebsd32_posix_fallocate freebsd32_pread freebsd32_preadv diff --git a/sys/kern/capabilities.conf b/sys/kern/capabilities.conf index 7857d086229..b5198b7a341 100644 --- a/sys/kern/capabilities.conf +++ b/sys/kern/capabilities.conf @@ -486,9 +486,9 @@ pipe2 ## ## Allow poll(2), which will be scoped by capability rights. -## XXXRW: We don't yet do that scoping. ## poll +ppoll ## ## Allow I/O-related file descriptors, subject to capability rights. -- 2.45.2