svn commit: r343596 - in stable/12/sys: compat/freebsd32 kern

[Brooks Davis]

Author: brooks
Date: Wed Jan 30 23:47:21 2019
New Revision: 343596
URL: https://svnweb.freebsd.org/changeset/base/343596

Log:
  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 <sg2342 at googlemail.com>
  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

Modified:
  stable/12/sys/compat/freebsd32/capabilities.conf
  stable/12/sys/kern/capabilities.conf
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/compat/freebsd32/capabilities.conf
==============================================================================
--- stable/12/sys/compat/freebsd32/capabilities.conf	Wed Jan 30 23:38:42 2019	(r343595)
+++ stable/12/sys/compat/freebsd32/capabilities.conf	Wed Jan 30 23:47:21 2019	(r343596)
@@ -204,6 +204,7 @@ pdkill
 freebsd32_pipe
 pipe2
 poll
+freebsd32_ppoll
 freebsd32_posix_fallocate
 freebsd32_pread
 freebsd32_preadv

Modified: stable/12/sys/kern/capabilities.conf
==============================================================================
--- stable/12/sys/kern/capabilities.conf	Wed Jan 30 23:38:42 2019	(r343595)
+++ stable/12/sys/kern/capabilities.conf	Wed Jan 30 23:47:21 2019	(r343596)
@@ -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.