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

[Ed Maste]

Author: emaste
Date: Wed Jun  3 13:12:08 2015
New Revision: 283943
URL: https://svnweb.freebsd.org/changeset/base/283943

Log:
  MFC r261220 by csjp: Allow sigwait(2) in capabilities mode.
  
    It's common for multi-threaded processes to create a thread for
    the purpose of synchronously processing signals. Allow such processes to
    utilize a capabilities sandbox.

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 13:10:25 2015	(r283942)
+++ stable/10/sys/kern/capabilities.conf	Wed Jun  3 13:12:08 2015	(r283943)
@@ -667,6 +667,7 @@ sigsuspend
 sigtimedwait
 sigvec
 sigwaitinfo
+sigwait
 
 ##
 ## Allow creating new socket pairs with socket(2) and socketpair(2).

Modified: stable/10/sys/kern/init_sysent.c
==============================================================================
--- stable/10/sys/kern/init_sysent.c	Wed Jun  3 13:10:25 2015	(r283942)
+++ stable/10/sys/kern/init_sysent.c	Wed Jun  3 13:12:08 2015	(r283943)
@@ -463,7 +463,7 @@ struct sysent sysent[] = {
 	{ AS(__acl_set_link_args), (sy_call_t *)sys___acl_set_link, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 426 = __acl_set_link */
 	{ AS(__acl_delete_link_args), (sy_call_t *)sys___acl_delete_link, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 427 = __acl_delete_link */
 	{ AS(__acl_aclcheck_link_args), (sy_call_t *)sys___acl_aclcheck_link, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 428 = __acl_aclcheck_link */
-	{ AS(sigwait_args), (sy_call_t *)sys_sigwait, AUE_SIGWAIT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 429 = sigwait */
+	{ AS(sigwait_args), (sy_call_t *)sys_sigwait, AUE_SIGWAIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 429 = sigwait */
 	{ AS(thr_create_args), (sy_call_t *)sys_thr_create, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 430 = thr_create */
 	{ AS(thr_exit_args), (sy_call_t *)sys_thr_exit, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 431 = thr_exit */
 	{ AS(thr_self_args), (sy_call_t *)sys_thr_self, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 432 = thr_self */