Author: markj
Date: Mon Jul 13 16:43:23 2020
New Revision: 363161
URL: https://svnweb.freebsd.org/changeset/base/363161
Log:
MFC r362970, r362971:
Permit cpuset_(get|set)domain() in capability mode.
Modified:
stable/12/sys/compat/freebsd32/freebsd32_sysent.c
stable/12/sys/kern/capabilities.conf
stable/12/sys/kern/init_sysent.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/compat/freebsd32/freebsd32_sysent.c
==============================================================================
--- stable/12/sys/compat/freebsd32/freebsd32_sysent.c Mon Jul 13 16:42:30
2020 (r363160)
+++ stable/12/sys/compat/freebsd32/freebsd32_sysent.c Mon Jul 13 16:43:23
2020 (r363161)
@@ -644,8 +644,8 @@ struct sysent freebsd32_sysent[] = {
{ AS(freebsd32_mknodat_args), (sy_call_t *)freebsd32_mknodat,
AUE_MKNODAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 559 =
freebsd32_mknodat */
#endif
{ AS(freebsd32_kevent_args), (sy_call_t *)freebsd32_kevent, AUE_KEVENT,
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 560 = freebsd32_kevent */
- { AS(freebsd32_cpuset_getdomain_args), (sy_call_t
*)freebsd32_cpuset_getdomain, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },
/* 561 = freebsd32_cpuset_getdomain */
- { AS(freebsd32_cpuset_setdomain_args), (sy_call_t
*)freebsd32_cpuset_setdomain, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },
/* 562 = freebsd32_cpuset_setdomain */
+ { AS(freebsd32_cpuset_getdomain_args), (sy_call_t
*)freebsd32_cpuset_getdomain, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED,
SY_THR_STATIC }, /* 561 = freebsd32_cpuset_getdomain */
+ { AS(freebsd32_cpuset_setdomain_args), (sy_call_t
*)freebsd32_cpuset_setdomain, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED,
SY_THR_STATIC }, /* 562 = freebsd32_cpuset_setdomain */
{ AS(getrandom_args), (sy_call_t *)sys_getrandom, AUE_NULL, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 563 = getrandom */
{ AS(getfhat_args), (sy_call_t *)sys_getfhat, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 564 = getfhat */
{ AS(fhlink_args), (sy_call_t *)sys_fhlink, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 565 = fhlink */
Modified: stable/12/sys/kern/capabilities.conf
==============================================================================
--- stable/12/sys/kern/capabilities.conf Mon Jul 13 16:42:30 2020
(r363160)
+++ stable/12/sys/kern/capabilities.conf Mon Jul 13 16:43:23 2020
(r363161)
@@ -142,8 +142,10 @@ connectat
##
#cpuset
cpuset_getaffinity
+cpuset_getdomain
#cpuset_getid
cpuset_setaffinity
+cpuset_setdomain
#cpuset_setid
##
Modified: stable/12/sys/kern/init_sysent.c
==============================================================================
--- stable/12/sys/kern/init_sysent.c Mon Jul 13 16:42:30 2020
(r363160)
+++ stable/12/sys/kern/init_sysent.c Mon Jul 13 16:43:23 2020
(r363161)
@@ -610,8 +610,8 @@ struct sysent sysent[] = {
{ AS(fhstatfs_args), (sy_call_t *)sys_fhstatfs, AUE_FHSTATFS, NULL, 0,
0, 0, SY_THR_STATIC }, /* 558 = fhstatfs */
{ AS(mknodat_args), (sy_call_t *)sys_mknodat, AUE_MKNODAT, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 559 = mknodat */
{ AS(kevent_args), (sy_call_t *)sys_kevent, AUE_KEVENT, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 560 = kevent */
- { AS(cpuset_getdomain_args), (sy_call_t *)sys_cpuset_getdomain,
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 561 = cpuset_getdomain */
- { AS(cpuset_setdomain_args), (sy_call_t *)sys_cpuset_setdomain,
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 562 = cpuset_setdomain */
+ { AS(cpuset_getdomain_args), (sy_call_t *)sys_cpuset_getdomain,
AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 561 =
cpuset_getdomain */
+ { AS(cpuset_setdomain_args), (sy_call_t *)sys_cpuset_setdomain,
AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 562 =
cpuset_setdomain */
{ AS(getrandom_args), (sy_call_t *)sys_getrandom, AUE_NULL, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 563 = getrandom */
{ AS(getfhat_args), (sy_call_t *)sys_getfhat, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 564 = getfhat */
{ AS(fhlink_args), (sy_call_t *)sys_fhlink, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 565 = fhlink */
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
