svn commit: r283942 - stable/10/sys/kern

[Ed Maste]

Author: emaste
Date: Wed Jun  3 13:10:25 2015
New Revision: 283942
URL: https://svnweb.freebsd.org/changeset/base/283942

Log:
  MFC r259436,259437 by pjd: Allow for pselect(2) in capability mode.

Modified:
  stable/10/sys/kern/capabilities.conf
  stable/10/sys/kern/init_sysent.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/capabilities.conf
==============================================================================
--- stable/10/sys/kern/capabilities.conf	Wed Jun  3 11:39:29 2015	(r283941)
+++ stable/10/sys/kern/capabilities.conf	Wed Jun  3 13:10:25 2015	(r283942)
@@ -559,10 +559,11 @@ sctp_generic_sendmsg_iov
 sctp_peeloff
 
 ##
-## Allow select(2), which will be scoped by capability rights.
+## Allow pselect(2) and select(2), which will be scoped by capability rights.
 ##
 ## XXXRW: But is it?
 ##
+pselect
 select
 
 ##

Modified: stable/10/sys/kern/init_sysent.c
==============================================================================
--- stable/10/sys/kern/init_sysent.c	Wed Jun  3 11:39:29 2015	(r283941)
+++ stable/10/sys/kern/init_sysent.c	Wed Jun  3 13:10:25 2015	(r283942)
@@ -556,7 +556,7 @@ struct sysent sysent[] = {
 	{ AS(pdkill_args), (sy_call_t *)sys_pdkill, AUE_PDKILL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 519 = pdkill */
 	{ AS(pdgetpid_args), (sy_call_t *)sys_pdgetpid, AUE_PDGETPID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 520 = pdgetpid */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 521 = pdwait4 */
-	{ AS(pselect_args), (sy_call_t *)sys_pselect, AUE_SELECT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 522 = pselect */
+	{ AS(pselect_args), (sy_call_t *)sys_pselect, AUE_SELECT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 522 = pselect */
 	{ AS(getloginclass_args), (sy_call_t *)sys_getloginclass, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 523 = getloginclass */
 	{ AS(setloginclass_args), (sy_call_t *)sys_setloginclass, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 524 = setloginclass */
 	{ AS(rctl_get_racct_args), (sy_call_t *)sys_rctl_get_racct, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 525 = rctl_get_racct */