Page MenuHomeFreeBSD
Files F150311929

D7548.id19414.diff
No OneTemporary
Actions

D7548.id19414.diff
View Options

Index: lib/libc/aarch64/sys/Makefile.inc
===================================================================
--- lib/libc/aarch64/sys/Makefile.inc
+++ lib/libc/aarch64/sys/Makefile.inc
@@ -15,7 +15,6 @@
NOASM= break.o \
exit.o \
getlogin.o \
- openbsd_poll.o \
sbrk.o \
sstk.o \
vfork.o \
Index: lib/libc/amd64/sys/Makefile.inc
===================================================================
--- lib/libc/amd64/sys/Makefile.inc
+++ lib/libc/amd64/sys/Makefile.inc
@@ -8,6 +8,6 @@
sbrk.S setlogin.S sigreturn.S
# Don't generate default code for these syscalls:
-NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
+NOASM= break.o exit.o getlogin.o sstk.o vfork.o yield.o
PSEUDO= _getlogin.o _exit.o
Index: lib/libc/arm/sys/Makefile.inc
===================================================================
--- lib/libc/arm/sys/Makefile.inc
+++ lib/libc/arm/sys/Makefile.inc
@@ -5,6 +5,6 @@
MDASM= Ovfork.S brk.S cerror.S ptrace.S sbrk.S shmat.S sigreturn.S syscall.S
# Don't generate default code for these syscalls:
-NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
+NOASM= break.o exit.o getlogin.o sstk.o vfork.o yield.o
PSEUDO= _exit.o _getlogin.o
Index: lib/libc/i386/sys/Makefile.inc
===================================================================
--- lib/libc/i386/sys/Makefile.inc
+++ lib/libc/i386/sys/Makefile.inc
@@ -12,7 +12,7 @@
sbrk.S setlogin.S sigreturn.S syscall.S
# Don't generate default code for these syscalls:
-NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
+NOASM= break.o exit.o getlogin.o sstk.o vfork.o yield.o
PSEUDO= _getlogin.o _exit.o
Index: lib/libc/mips/sys/Makefile.inc
===================================================================
--- lib/libc/mips/sys/Makefile.inc
+++ lib/libc/mips/sys/Makefile.inc
@@ -6,6 +6,6 @@
ptrace.S sbrk.S syscall.S
# Don't generate default code for these syscalls:
-NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
+NOASM= break.o exit.o getlogin.o sstk.o vfork.o yield.o
PSEUDO= _exit.o _getlogin.o
Index: lib/libc/powerpc/sys/Makefile.inc
===================================================================
--- lib/libc/powerpc/sys/Makefile.inc
+++ lib/libc/powerpc/sys/Makefile.inc
@@ -3,6 +3,6 @@
MDASM+= brk.S cerror.S exect.S ptrace.S sbrk.S setlogin.S
# Don't generate default code for these syscalls:
-NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o
+NOASM= break.o exit.o getlogin.o sstk.o yield.o
PSEUDO= _getlogin.o _exit.o
Index: lib/libc/powerpc64/sys/Makefile.inc
===================================================================
--- lib/libc/powerpc64/sys/Makefile.inc
+++ lib/libc/powerpc64/sys/Makefile.inc
@@ -3,6 +3,6 @@
MDASM+= brk.S cerror.S exect.S ptrace.S sbrk.S setlogin.S
# Don't generate default code for these syscalls:
-NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o
+NOASM= break.o exit.o getlogin.o sstk.o yield.o
PSEUDO= _getlogin.o _exit.o
Index: lib/libc/riscv/sys/Makefile.inc
===================================================================
--- lib/libc/riscv/sys/Makefile.inc
+++ lib/libc/riscv/sys/Makefile.inc
@@ -13,7 +13,6 @@
NOASM= break.o \
exit.o \
getlogin.o \
- openbsd_poll.o \
sbrk.o \
sstk.o \
vfork.o \
Index: lib/libc/sparc64/sys/Makefile.inc
===================================================================
--- lib/libc/sparc64/sys/Makefile.inc
+++ lib/libc/sparc64/sys/Makefile.inc
@@ -15,6 +15,6 @@
MDASM+= brk.S cerror.S exect.S ptrace.S sbrk.S setlogin.S sigaction1.S
# Don't generate default code for these syscalls:
-NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o
+NOASM= break.o exit.o getlogin.o sstk.o yield.o
PSEUDO= _getlogin.o _exit.o
Index: sys/compat/freebsd32/freebsd32_syscall.h
===================================================================
--- sys/compat/freebsd32/freebsd32_syscall.h
+++ sys/compat/freebsd32/freebsd32_syscall.h
@@ -218,7 +218,7 @@
#define FREEBSD32_SYS_freebsd32_clock_getcpuclockid2 247
#define FREEBSD32_SYS_minherit 250
#define FREEBSD32_SYS_rfork 251
-#define FREEBSD32_SYS_openbsd_poll 252
+ /* 252 is obsolete openbsd_poll */
#define FREEBSD32_SYS_issetugid 253
#define FREEBSD32_SYS_lchown 254
#define FREEBSD32_SYS_freebsd32_aio_read 255
Index: sys/compat/freebsd32/freebsd32_syscalls.c
===================================================================
--- sys/compat/freebsd32/freebsd32_syscalls.c
+++ sys/compat/freebsd32/freebsd32_syscalls.c
@@ -262,7 +262,7 @@
"#249", /* 249 = nosys */
"minherit", /* 250 = minherit */
"rfork", /* 251 = rfork */
- "openbsd_poll", /* 252 = openbsd_poll */
+ "obs_openbsd_poll", /* 252 = obsolete openbsd_poll */
"issetugid", /* 253 = issetugid */
"lchown", /* 254 = lchown */
"freebsd32_aio_read", /* 255 = freebsd32_aio_read */
Index: sys/compat/freebsd32/freebsd32_sysent.c
===================================================================
--- sys/compat/freebsd32/freebsd32_sysent.c
+++ sys/compat/freebsd32/freebsd32_sysent.c
@@ -305,7 +305,7 @@
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 249 = nosys */
{ AS(minherit_args), (sy_call_t *)sys_minherit, AUE_MINHERIT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 250 = minherit */
{ AS(rfork_args), (sy_call_t *)sys_rfork, AUE_RFORK, NULL, 0, 0, 0, SY_THR_STATIC }, /* 251 = rfork */
- { AS(openbsd_poll_args), (sy_call_t *)sys_openbsd_poll, AUE_POLL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 252 = openbsd_poll */
+ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 252 = obsolete openbsd_poll */
{ 0, (sy_call_t *)sys_issetugid, AUE_ISSETUGID, NULL, 0, 0, 0, SY_THR_STATIC }, /* 253 = issetugid */
{ AS(lchown_args), (sy_call_t *)sys_lchown, AUE_LCHOWN, NULL, 0, 0, 0, SY_THR_STATIC }, /* 254 = lchown */
{ AS(freebsd32_aio_read_args), (sy_call_t *)freebsd32_aio_read, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 255 = freebsd32_aio_read */
Index: sys/compat/freebsd32/freebsd32_systrace_args.c
===================================================================
--- sys/compat/freebsd32/freebsd32_systrace_args.c
+++ sys/compat/freebsd32/freebsd32_systrace_args.c
@@ -1286,15 +1286,6 @@
*n_args = 1;
break;
}
- /* openbsd_poll */
- case 252: {
- struct openbsd_poll_args *p = params;
- uarg[0] = (intptr_t) p->fds; /* struct pollfd * */
- uarg[1] = p->nfds; /* u_int */
- iarg[2] = p->timeout; /* int */
- *n_args = 3;
- break;
- }
/* issetugid */
case 253: {
*n_args = 0;
@@ -5357,22 +5348,6 @@
break;
};
break;
- /* openbsd_poll */
- case 252:
- switch(ndx) {
- case 0:
- p = "struct pollfd *";
- break;
- case 1:
- p = "u_int";
- break;
- case 2:
- p = "int";
- break;
- default:
- break;
- };
- break;
/* issetugid */
case 253:
break;
@@ -9666,11 +9641,6 @@
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* openbsd_poll */
- case 252:
- if (ndx == 0 || ndx == 1)
- p = "int";
- break;
/* issetugid */
case 253:
/* lchown */
Index: sys/compat/freebsd32/syscalls.master
===================================================================
--- sys/compat/freebsd32/syscalls.master
+++ sys/compat/freebsd32/syscalls.master
@@ -474,8 +474,7 @@
250 AUE_MINHERIT NOPROTO { int minherit(void *addr, size_t len, \
int inherit); }
251 AUE_RFORK NOPROTO { int rfork(int flags); }
-252 AUE_POLL NOPROTO { int openbsd_poll(struct pollfd *fds, \
- u_int nfds, int timeout); }
+252 AUE_NULL OBSOL openbsd_poll
253 AUE_ISSETUGID NOPROTO { int issetugid(void); }
254 AUE_LCHOWN NOPROTO { int lchown(char *path, int uid, int gid); }
255 AUE_NULL STD { int freebsd32_aio_read( \
Index: sys/kern/capabilities.conf
===================================================================
--- sys/kern/capabilities.conf
+++ sys/kern/capabilities.conf
@@ -465,14 +465,6 @@
open
##
-## Allow poll(2), which will be scoped by capability rights.
-##
-## XXXRW: Perhaps we don't need the OpenBSD version?
-## XXXRW: We don't yet do that scoping.
-##
-openbsd_poll
-
-##
## Process descriptor-related system calls are allowed.
##
pdfork
Index: sys/kern/init_sysent.c
===================================================================
--- sys/kern/init_sysent.c
+++ sys/kern/init_sysent.c
@@ -298,7 +298,7 @@
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 249 = nosys */
{ AS(minherit_args), (sy_call_t *)sys_minherit, AUE_MINHERIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 250 = minherit */
{ AS(rfork_args), (sy_call_t *)sys_rfork, AUE_RFORK, NULL, 0, 0, 0, SY_THR_STATIC }, /* 251 = rfork */
- { AS(openbsd_poll_args), (sy_call_t *)sys_openbsd_poll, AUE_POLL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 252 = openbsd_poll */
+ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 252 = obsolete openbsd_poll */
{ 0, (sy_call_t *)sys_issetugid, AUE_ISSETUGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 253 = issetugid */
{ AS(lchown_args), (sy_call_t *)sys_lchown, AUE_LCHOWN, NULL, 0, 0, 0, SY_THR_STATIC }, /* 254 = lchown */
{ AS(aio_read_args), (sy_call_t *)sys_aio_read, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 255 = aio_read */
Index: sys/kern/sys_generic.c
===================================================================
--- sys/kern/sys_generic.c
+++ sys/kern/sys_generic.c
@@ -1608,26 +1608,6 @@
}
/*
- * OpenBSD poll system call.
- *
- * XXX this isn't quite a true representation.. OpenBSD uses select ops.
- */
-#ifndef _SYS_SYSPROTO_H_
-struct openbsd_poll_args {
- struct pollfd *fds;
- u_int nfds;
- int timeout;
-};
-#endif
-int
-sys_openbsd_poll(td, uap)
- register struct thread *td;
- register struct openbsd_poll_args *uap;
-{
- return (sys_poll(td, (struct poll_args *)uap));
-}
-
-/*
* XXX This was created specifically to support netncp and netsmb. This
* allows the caller to specify a socket to wait for events on. It returns
* 0 if any events matched and an error otherwise. There is no way to
Index: sys/kern/syscalls.c
===================================================================
--- sys/kern/syscalls.c
+++ sys/kern/syscalls.c
@@ -259,7 +259,7 @@
"#249", /* 249 = nosys */
"minherit", /* 250 = minherit */
"rfork", /* 251 = rfork */
- "openbsd_poll", /* 252 = openbsd_poll */
+ "obs_openbsd_poll", /* 252 = obsolete openbsd_poll */
"issetugid", /* 253 = issetugid */
"lchown", /* 254 = lchown */
"aio_read", /* 255 = aio_read */
Index: sys/kern/syscalls.master
===================================================================
--- sys/kern/syscalls.master
+++ sys/kern/syscalls.master
@@ -472,8 +472,7 @@
250 AUE_MINHERIT STD { int minherit(void *addr, size_t len, \
int inherit); }
251 AUE_RFORK STD { int rfork(int flags); }
-252 AUE_POLL STD { int openbsd_poll(struct pollfd *fds, \
- u_int nfds, int timeout); }
+252 AUE_NULL OBSOL openbsd_poll
253 AUE_ISSETUGID STD { int issetugid(void); }
254 AUE_LCHOWN STD { int lchown(char *path, int uid, int gid); }
255 AUE_NULL STD { int aio_read(struct aiocb *aiocbp); }
Index: sys/kern/systrace_args.c
===================================================================
--- sys/kern/systrace_args.c
+++ sys/kern/systrace_args.c
@@ -1322,15 +1322,6 @@
*n_args = 1;
break;
}
- /* openbsd_poll */
- case 252: {
- struct openbsd_poll_args *p = params;
- uarg[0] = (intptr_t) p->fds; /* struct pollfd * */
- uarg[1] = p->nfds; /* u_int */
- iarg[2] = p->timeout; /* int */
- *n_args = 3;
- break;
- }
/* issetugid */
case 253: {
*n_args = 0;
@@ -5426,22 +5417,6 @@
break;
};
break;
- /* openbsd_poll */
- case 252:
- switch(ndx) {
- case 0:
- p = "struct pollfd *";
- break;
- case 1:
- p = "u_int";
- break;
- case 2:
- p = "int";
- break;
- default:
- break;
- };
- break;
/* issetugid */
case 253:
break;
@@ -9648,11 +9623,6 @@
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* openbsd_poll */
- case 252:
- if (ndx == 0 || ndx == 1)
- p = "int";
- break;
/* issetugid */
case 253:
/* lchown */
Index: sys/sys/syscall.h
===================================================================
--- sys/sys/syscall.h
+++ sys/sys/syscall.h
@@ -223,7 +223,7 @@
#define SYS_ntp_gettime 248
#define SYS_minherit 250
#define SYS_rfork 251
-#define SYS_openbsd_poll 252
+ /* 252 is obsolete openbsd_poll */
#define SYS_issetugid 253
#define SYS_lchown 254
#define SYS_aio_read 255
Index: sys/sys/syscall.mk
===================================================================
--- sys/sys/syscall.mk
+++ sys/sys/syscall.mk
@@ -163,7 +163,6 @@
ntp_gettime.o \
minherit.o \
rfork.o \
- openbsd_poll.o \
issetugid.o \
lchown.o \
aio_read.o \
Index: sys/sys/sysproto.h
===================================================================
--- sys/sys/sysproto.h
+++ sys/sys/sysproto.h
@@ -714,11 +714,6 @@
struct rfork_args {
char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
};
-struct openbsd_poll_args {
- char fds_l_[PADL_(struct pollfd *)]; struct pollfd * fds; char fds_r_[PADR_(struct pollfd *)];
- char nfds_l_[PADL_(u_int)]; u_int nfds; char nfds_r_[PADR_(u_int)];
- char timeout_l_[PADL_(int)]; int timeout; char timeout_r_[PADR_(int)];
-};
struct issetugid_args {
register_t dummy;
};
@@ -1946,7 +1941,6 @@
int sys_ntp_gettime(struct thread *, struct ntp_gettime_args *);
int sys_minherit(struct thread *, struct minherit_args *);
int sys_rfork(struct thread *, struct rfork_args *);
-int sys_openbsd_poll(struct thread *, struct openbsd_poll_args *);
int sys_issetugid(struct thread *, struct issetugid_args *);
int sys_lchown(struct thread *, struct lchown_args *);
int sys_aio_read(struct thread *, struct aio_read_args *);
@@ -2717,7 +2711,6 @@
#define SYS_AUE_ntp_gettime AUE_NULL
#define SYS_AUE_minherit AUE_MINHERIT
#define SYS_AUE_rfork AUE_RFORK
-#define SYS_AUE_openbsd_poll AUE_POLL
#define SYS_AUE_issetugid AUE_ISSETUGID
#define SYS_AUE_lchown AUE_LCHOWN
#define SYS_AUE_aio_read AUE_NULL

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 1, 3:03 AM (5 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30661895
Default Alt Text
D7548.id19414.diff (13 KB)

Event Timeline