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

[Brooks Davis]

Author: brooks
Date: Mon Nov 12 18:21:17 2018
New Revision: 340378
URL: https://svnweb.freebsd.org/changeset/base/340378

Log:
  MFC r340272, r340274, r340294
  
  r340272:
  Make __sysctl follow the freebsd32_foo convention.
  
  Sponsored by:	DARPA, AFRL
  
  r340274:
  Make freebsd32_umtx_op follow the freebsd32_foo convention.
  
  Sponsored by:	DARPA, AFRL
  
  r340294:
  Fix a number of bugs in freebsd32's capabilities.conf.
  
  Bugs range from failure to update after changing syscall implementaion
  names to using the wrong name.  Somewhat confusingly, the name in
  capabilities.conf is exactly the string that appears in syscalls.master,
  not the name with a COMPAT* prefix which is the actual function name.
  
  Found while making a change to use the default capabilities.conf.
  
  Fixes:	r335177, r336980, r340272, r340274, others
  Reviewed by:	kib, emaste
  Approved by:	re (gjb)
  Sponsored by:	DARPA, AFRL
  Differential Revision:	https://reviews.freebsd.org/D17925

Modified:
  stable/12/sys/compat/freebsd32/capabilities.conf
  stable/12/sys/compat/freebsd32/freebsd32_misc.c
  stable/12/sys/compat/freebsd32/syscalls.master
  stable/12/sys/kern/kern_umtx.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/compat/freebsd32/capabilities.conf
==============================================================================
--- stable/12/sys/compat/freebsd32/capabilities.conf	Mon Nov 12 18:01:36 2018	(r340377)
+++ stable/12/sys/compat/freebsd32/capabilities.conf	Mon Nov 12 18:21:17 2018	(r340378)
@@ -47,14 +47,14 @@ __mac_get_fd
 __mac_get_proc
 __mac_set_fd
 __mac_set_proc
-freebsd32_sysctl
-freebsd32_umtx_op
+freebsd32___sysctl
+freebsd32__umtx_op
 abort2
 accept
 accept4
 aio_cancel
 freebsd32_aio_error
-aio_fsync
+freebsd32_aio_fsync
 freebsd32_aio_read
 freebsd32_aio_return
 freebsd32_aio_suspend
@@ -94,17 +94,18 @@ freebsd32_fexecve
 flock
 fork
 fpathconf
-freebsd11_freebsd32_fstat
-freebsd11_freebsd32_fstatat
-freebsd11_freebsd32_getdirentries
-freebsd11_freebsd32_fstatfs
-freebsd11_freebsd32_mknodat
-freebsd6_freebsd32_ftruncate
-freebsd6_freebsd32_lseek
-freebsd6_freebsd32_mmap
-freebsd6_freebsd32_pread
-freebsd6_freebsd32_pwrite
 freebsd32_fstat
+freebsd32_fstatat
+freebsd32_getdirentries
+freebsd32_fstatfs
+freebsd32_mknodat
+freebsd32_ftruncate
+freebsd32_lseek
+freebsd32_mmap
+mmap
+freebsd32_pread
+freebsd32_pwrite
+freebsd32_fstat
 fstatfs
 fsync
 ftruncate
@@ -115,7 +116,7 @@ getaudit
 getaudit_addr
 getauid
 freebsd32_getcontext
-getdents
+freebsd32_getdents
 freebsd32_getdirentries
 getdirentries
 getdomainname
@@ -178,7 +179,7 @@ freebsd32_nanosleep
 ntp_gettime
 freebsd6_freebsd32_aio_read
 freebsd6_freebsd32_aio_write
-obreak
+break
 freebsd6_freebsd32_lio_listio
 chflagsat
 faccessat
@@ -222,7 +223,7 @@ sched_get_priority_max
 sched_get_priority_min
 sched_getparam
 sched_getscheduler
-sched_rr_get_interval
+freebsd32_sched_rr_get_interval
 sched_setparam
 sched_setscheduler
 sched_yield
@@ -259,11 +260,15 @@ freebsd32_sigaction
 freebsd32_sigaltstack
 freebsd32_sigblock
 freebsd32_sigpending
+sigpending
+freebsd32_sigprocmask
 sigprocmask
+freebsd32_sigqueue
 sigqueue
 freebsd32_sigreturn
 freebsd32_sigsetmask
-ofreebsd32_sigstack
+freebsd32_sigstack
+freebsd32_sigsuspend
 sigsuspend
 freebsd32_sigtimedwait
 freebsd32_sigvec

Modified: stable/12/sys/compat/freebsd32/freebsd32_misc.c
==============================================================================
--- stable/12/sys/compat/freebsd32/freebsd32_misc.c	Mon Nov 12 18:01:36 2018	(r340377)
+++ stable/12/sys/compat/freebsd32/freebsd32_misc.c	Mon Nov 12 18:21:17 2018	(r340378)
@@ -2260,7 +2260,7 @@ freebsd11_freebsd32_fhstat(struct thread *td,
 #endif
 
 int
-freebsd32_sysctl(struct thread *td, struct freebsd32_sysctl_args *uap)
+freebsd32___sysctl(struct thread *td, struct freebsd32___sysctl_args *uap)
 {
 	int error, name[CTL_MAXNAME];
 	size_t j, oldlen;

Modified: stable/12/sys/compat/freebsd32/syscalls.master
==============================================================================
--- stable/12/sys/compat/freebsd32/syscalls.master	Mon Nov 12 18:01:36 2018	(r340377)
+++ stable/12/sys/compat/freebsd32/syscalls.master	Mon Nov 12 18:21:17 2018	(r340378)
@@ -377,7 +377,7 @@
 				    uint32_t length2); }
 201	AUE_FTRUNCATE	COMPAT6	{ int freebsd32_ftruncate(int fd, int pad, \
 				    uint32_t length1, uint32_t length2); }
-202	AUE_SYSCTL	STD	{ int freebsd32_sysctl(int *name, \
+202	AUE_SYSCTL	STD	{ int freebsd32___sysctl(int *name, \
 				    u_int namelen, void *old, \
 				    uint32_t *oldlenp, void *new, \
 				    uint32_t newlen); }
@@ -809,7 +809,7 @@
 				    struct auditinfo_addr *auditinfo_addr, \
 				    u_int length); }
 453	AUE_AUDITCTL	NOPROTO	{ int auditctl(char *path); }
-454	AUE_NULL	STD	{ int freebsd32_umtx_op(void *obj, int op,\
+454	AUE_NULL	STD	{ int freebsd32__umtx_op(void *obj, int op,\
 				    u_long val, void *uaddr, \
 				    void *uaddr2); }
 455	AUE_THR_NEW	STD	{ int freebsd32_thr_new(	\

Modified: stable/12/sys/kern/kern_umtx.c
==============================================================================
--- stable/12/sys/kern/kern_umtx.c	Mon Nov 12 18:01:36 2018	(r340377)
+++ stable/12/sys/kern/kern_umtx.c	Mon Nov 12 18:21:17 2018	(r340378)
@@ -4351,7 +4351,7 @@ static const _umtx_op_func op_table_compat32[] = {
 };
 
 int
-freebsd32_umtx_op(struct thread *td, struct freebsd32_umtx_op_args *uap)
+freebsd32__umtx_op(struct thread *td, struct freebsd32__umtx_op_args *uap)
 {
 
 	if ((unsigned)uap->op < nitems(op_table_compat32)) {