Index: stable/11/lib/libsysdecode/Makefile
===================================================================
--- stable/11/lib/libsysdecode/Makefile	(revision 361019)
+++ stable/11/lib/libsysdecode/Makefile	(revision 361020)
@@ -1,143 +1,150 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PACKAGE=lib${LIB}
 LIB=	sysdecode
 
 SRCS=	errno.c flags.c ioctl.c signal.c syscallnames.c utrace.c
 INCS=	sysdecode.h
 
 CFLAGS+= -I${.OBJDIR}
 CFLAGS+= -I${SRCTOP}/sys
 CFLAGS+= -I${SRCTOP}/libexec/rtld-elf
 
 MAN=	sysdecode.3 \
 	sysdecode_abi_to_freebsd_errno.3 \
 	sysdecode_cap_rights.3 \
 	sysdecode_cmsg_type.3 \
 	sysdecode_enum.3 \
 	sysdecode_fcntl_arg.3 \
 	sysdecode_kevent.3 \
 	sysdecode_ioctlname.3 \
 	sysdecode_mask.3 \
 	sysdecode_quotactl_cmd.3 \
 	sysdecode_sctp_sinfo_flags.3 \
 	sysdecode_sigcode.3 \
 	sysdecode_sockopt_name.3 \
 	sysdecode_socket_protocol.3 \
 	sysdecode_syscallnames.3 \
 	sysdecode_utrace.3
 MLINKS= sysdecode_abi_to_freebsd_errno.3 sysdecode_freebsd_to_abi_errno.3
 MLINKS+=sysdecode_enum.3 sysdecode_acltype.3 \
 	sysdecode_enum.3 sysdecode_atfd.3 \
 	sysdecode_enum.3 sysdecode_extattrnamespace.3 \
 	sysdecode_enum.3 sysdecode_fadvice.3 \
 	sysdecode_enum.3 sysdecode_fcntl_cmd.3 \
 	sysdecode_enum.3 sysdecode_getfsstat_mode.3 \
 	sysdecode_enum.3 sysdecode_getrusage_who.3 \
 	sysdecode_enum.3 sysdecode_idtype.3 \
 	sysdecode_enum.3 sysdecode_ipproto.3 \
 	sysdecode_enum.3 sysdecode_kldsym_cmd.3 \
 	sysdecode_enum.3 sysdecode_kldunload_flags.3 \
 	sysdecode_enum.3 sysdecode_lio_listio_mode.3 \
 	sysdecode_enum.3 sysdecode_madvice.3 \
 	sysdecode_enum.3 sysdecode_minherit_flags.3 \
 	sysdecode_enum.3 sysdecode_msgctl_cmd.3 \
 	sysdecode_enum.3 sysdecode_nfssvc_flags.3 \
 	sysdecode_enum.3 sysdecode_pathconf_name.3 \
 	sysdecode_enum.3 sysdecode_prio_which.3 \
 	sysdecode_enum.3 sysdecode_procctl_cmd.3 \
 	sysdecode_enum.3 sysdecode_ptrace_request.3 \
 	sysdecode_enum.3 sysdecode_rlimit.3 \
 	sysdecode_enum.3 sysdecode_rtprio_function.3 \
 	sysdecode_enum.3 sysdecode_scheduler_policy.3 \
 	sysdecode_enum.3 sysdecode_sctp_pr_policy.3 \
 	sysdecode_enum.3 sysdecode_semctl_cmd.3 \
 	sysdecode_enum.3 sysdecode_shmctl_cmd.3 \
 	sysdecode_enum.3 sysdecode_shutdown_how.3 \
 	sysdecode_enum.3 sysdecode_sigbus_code.3 \
 	sysdecode_enum.3 sysdecode_sigchld_code.3 \
 	sysdecode_enum.3 sysdecode_sigfpe_code.3 \
 	sysdecode_enum.3 sysdecode_sigill_code.3 \
 	sysdecode_enum.3 sysdecode_signal.3 \
 	sysdecode_enum.3 sysdecode_sigprocmask_how.3 \
 	sysdecode_enum.3 sysdecode_sigsegv_code.3 \
 	sysdecode_enum.3 sysdecode_sigtrap_code.3 \
 	sysdecode_enum.3 sysdecode_sockaddr_family.3 \
 	sysdecode_enum.3 sysdecode_socketdomain.3 \
 	sysdecode_enum.3 sysdecode_sockettype.3 \
 	sysdecode_enum.3 sysdecode_sockopt_level.3 \
 	sysdecode_enum.3 sysdecode_sysarch_number.3 \
 	sysdecode_enum.3 sysdecode_umtx_op.3 \
 	sysdecode_enum.3 sysdecode_vmresult.3 \
 	sysdecode_enum.3 sysdecode_whence.3
 MLINKS+=sysdecode_fcntl_arg.3 sysdecode_fcntl_arg_p.3
 MLINKS+=sysdecode_kevent.3 sysdecode_kevent_fflags.3 \
 	sysdecode_kevent.3 sysdecode_kevent_filter.3 \
 	sysdecode_kevent.3 sysdecode_kevent_flags.3
 MLINKS+=sysdecode_mask.3 sysdecode_accessmode.3 \
 	sysdecode_mask.3 sysdecode_atflags.3 \
 	sysdecode_mask.3 sysdecode_capfcntlrights.3 \
 	sysdecode_mask.3 sysdecode_fcntl_fileflags.3 \
 	sysdecode_mask.3 sysdecode_fileflags.3 \
 	sysdecode_mask.3 sysdecode_filemode.3 \
 	sysdecode_mask.3 sysdecode_flock_operation.3 \
 	sysdecode_mask.3 sysdecode_mlockall_flags.3 \
 	sysdecode_mask.3 sysdecode_mmap_flags.3 \
 	sysdecode_mask.3 sysdecode_mmap_prot.3 \
 	sysdecode_mask.3 sysdecode_mount_flags.3 \
 	sysdecode_mask.3 sysdecode_msg_flags.3 \
 	sysdecode_mask.3 sysdecode_msync_flags.3 \
 	sysdecode_mask.3 sysdecode_open_flags.3 \
 	sysdecode_mask.3 sysdecode_pipe2_flags.3 \
 	sysdecode_mask.3 sysdecode_reboot_howto.3 \
 	sysdecode_mask.3 sysdecode_rfork_flags.3 \
 	sysdecode_mask.3 sysdecode_semget_flags.3 \
 	sysdecode_mask.3 sysdecode_sendfile_flags.3 \
 	sysdecode_mask.3 sysdecode_shmat_flags.3 \
 	sysdecode_mask.3 sysdecode_sctp_nxt_flags.3 \
 	sysdecode_mask.3 sysdecode_sctp_rcv_flags.3 \
 	sysdecode_mask.3 sysdecode_sctp_snd_flags.3 \
 	sysdecode_mask.3 sysdecode_socket_type.3 \
 	sysdecode_mask.3 sysdecode_thr_create_flags.3 \
 	sysdecode_mask.3 sysdecode_umtx_cvwait_flags.3 \
 	sysdecode_mask.3 sysdecode_umtx_rwlock_flags.3 \
 	sysdecode_mask.3 sysdecode_vmprot.3 \
 	sysdecode_mask.3 sysdecode_wait4_options.3 \
 	sysdecode_mask.3 sysdecode_wait6_options.3
 
 CLEANFILES= ioctl.c ioctl.c.tmp tables.h
 
 .if defined(COMPAT_32BIT)
 CPP+=	-m32
 .endif
 
 .if ${MK_PF} != "no"
 CFLAGS+=-DPF
 .endif
 
 # Workaround duplicate declarations in <netinet/ip_compat.h>
 CFLAGS.gcc.ioctl.c+= -Wno-redundant-decls
 
 # Workaround warning for unused ssi_cables[] in <dev/lmc/if_lmc.h>
 CFLAGS.gcc.ioctl.c+= -Wno-unused
 
+# Ignore deprecation warning in <sys/pioctl.h>
+CFLAGS.clang.ioctl.c+= -Wno-\#warnings
+.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40700
+CFLAGS.gcc.ioctl.c+= -Wno-cpp
+.endif
+
+CFLAGS.clang+=	${CFLAGS.clang.${.IMPSRC}}
 CFLAGS.gcc+=	${CFLAGS.gcc.${.IMPSRC}}
 
 DEPENDOBJS+=	tables.h
 tables.h: mktables
 	sh ${.CURDIR}/mktables ${DESTDIR}${INCLUDEDIR} ${.TARGET}
 
 # mkioctls runs find(1) for headers so needs to rebuild every time.  This used
 # to be a hack only done in buildworld.
 .if !defined(_SKIP_BUILD)
 ioctl.c: .PHONY
 .endif
 ioctl.c: mkioctls .META
 	env MACHINE=${MACHINE} CPP="${CPP}" MK_PF="${MK_PF}" \
 		/bin/sh ${.CURDIR}/mkioctls ${DESTDIR}${INCLUDEDIR} > ${.TARGET}
 
 beforedepend: ioctl.c tables.h
 
 .include <bsd.lib.mk>
Index: stable/11/sys/fs/procfs/procfs_ioctl.c
===================================================================
--- stable/11/sys/fs/procfs/procfs_ioctl.c	(revision 361019)
+++ stable/11/sys/fs/procfs/procfs_ioctl.c	(revision 361020)
@@ -1,220 +1,263 @@
 /*-
  * Copyright (c) 2001 Dag-Erling Coïdan Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer
  *    in this position and unchanged.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *      $FreeBSD$
  */
 
 #include "opt_compat.h"
 
 #include <sys/param.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/pioctl.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/systm.h>
 
 #include <fs/pseudofs/pseudofs.h>
 #include <fs/procfs/procfs.h>
 
 #ifdef COMPAT_FREEBSD32
 struct procfs_status32 {
 	int	state;	/* Running, stopped, something else? */
 	int	flags;	/* Any flags */
 	unsigned int	events;	/* Events to stop on */
 	int	why;	/* What event, if any, proc stopped on */
 	unsigned int	val;	/* Any extra data */
 };
 
 #define	PIOCWAIT32	_IOR('p', 4, struct procfs_status32)
 #define	PIOCSTATUS32	_IOR('p', 6, struct procfs_status32)
 #endif
 
 /*
  * Process ioctls
  */
 int
 procfs_ioctl(PFS_IOCTL_ARGS)
 {
 	struct procfs_status *ps;
 #ifdef COMPAT_FREEBSD32
 	struct procfs_status32 *ps32;
 #endif
 	int error, flags, sig;
 #ifdef COMPAT_FREEBSD6
 	int ival;
 #endif
+	static struct timeval lasttime;
+	static struct timeval interval = { .tv_sec = 1, .tv_usec = 0 };
 
 	KASSERT(p != NULL,
 	    ("%s() called without a process", __func__));
 	PROC_LOCK_ASSERT(p, MA_OWNED);
+
+	switch (cmd) {
+#if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
+	case _IOC(IOC_IN, 'p', 1, 0):
+#endif
+#ifdef COMPAT_FREEBSD6
+	case _IO('p', 1):
+#endif
+	case PIOCBIS:
+#if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
+	case _IOC(IOC_IN, 'p', 2, 0):
+#endif
+#ifdef COMPAT_FREEBSD6
+	case _IO('p', 2):
+#endif
+	case PIOCBIC:
+#if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
+	case _IOC(IOC_IN, 'p', 3, 0):
+#endif
+#ifdef COMPAT_FREEBSD6
+	case _IO('p', 3):
+#endif
+	case PIOCSFL:
+	case PIOCGFL:
+	case PIOCWAIT:
+	case PIOCSTATUS:
+#ifdef COMPAT_FREEBSD32
+	case PIOCWAIT32:
+	case PIOCSTATUS32:
+#endif
+#if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
+	case _IOC(IOC_IN, 'p', 5, 0):
+#endif
+#ifdef COMPAT_FREEBSD6
+	case _IO('p', 5):
+#endif
+	case PIOCCONT:
+		if (ratecheck(&lasttime, &interval) != 0)
+			gone_in(13, "procfs-based process debugging");
+		break;
+	}
 
 	error = 0;
 	switch (cmd) {
 #if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
 	case _IOC(IOC_IN, 'p', 1, 0):
 #endif
 #ifdef COMPAT_FREEBSD6
 	case _IO('p', 1):
 		ival = IOCPARM_IVAL(data);
 		data = &ival;
 #endif
 	case PIOCBIS:
 		p->p_stops |= *(unsigned int *)data;
 		break;
 #if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
 	case _IOC(IOC_IN, 'p', 2, 0):
 #endif
 #ifdef COMPAT_FREEBSD6
 	case _IO('p', 2):
 		ival = IOCPARM_IVAL(data);
 		data = &ival;
 #endif
 	case PIOCBIC:
 		p->p_stops &= ~*(unsigned int *)data;
 		break;
 #if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
 	case _IOC(IOC_IN, 'p', 3, 0):
 #endif
 #ifdef COMPAT_FREEBSD6
 	case _IO('p', 3):
 		ival = IOCPARM_IVAL(data);
 		data = &ival;
 #endif
 	case PIOCSFL:
 		flags = *(unsigned int *)data;
 		if (flags & PF_ISUGID) {
 			/*
 			 * XXXRW: Is this specific check required here, as
 			 * p_candebug() should implement it, or other checks
 			 * are missing.
 			 */
 			error = priv_check(td, PRIV_DEBUG_SUGID);
 			if (error)
 				break;
 		}
 		p->p_pfsflags = flags;
 		break;
 	case PIOCGFL:
 		*(unsigned int *)data = p->p_pfsflags;
 		break;
 	case PIOCWAIT:
 		while (p->p_step == 0 && (p->p_flag & P_WEXIT) == 0) {
 			/* sleep until p stops */
 			_PHOLD(p);
 			error = msleep(&p->p_stype, &p->p_mtx,
 			    PWAIT|PCATCH, "pioctl", 0);
 			_PRELE(p);
 			if (error != 0)
 				break;
 		}
 		/* fall through to PIOCSTATUS */
 	case PIOCSTATUS:
 		ps = (struct procfs_status *)data;
 		ps->state = (p->p_step == 0);
 		ps->flags = 0; /* nope */
 		ps->events = p->p_stops;
 		ps->why = p->p_step ? p->p_stype : 0;
 		ps->val = p->p_step ? p->p_xsig : 0;
 		break;
 #ifdef COMPAT_FREEBSD32
 	case PIOCWAIT32:
 		while (p->p_step == 0 && (p->p_flag & P_WEXIT) == 0) {
 			/* sleep until p stops */
 			_PHOLD(p);
 			error = msleep(&p->p_stype, &p->p_mtx,
 			    PWAIT|PCATCH, "pioctl", 0);
 			_PRELE(p);
 			if (error != 0)
 				break;
 		}
 		/* fall through to PIOCSTATUS32 */
 	case PIOCSTATUS32:
 		ps32 = (struct procfs_status32 *)data;
 		ps32->state = (p->p_step == 0);
 		ps32->flags = 0; /* nope */
 		ps32->events = p->p_stops;
 		ps32->why = p->p_step ? p->p_stype : 0;
 		ps32->val = p->p_step ? p->p_xsig : 0;
 		break;
 #endif
 #if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
 	case _IOC(IOC_IN, 'p', 5, 0):
 #endif
 #ifdef COMPAT_FREEBSD6
 	case _IO('p', 5):
 		ival = IOCPARM_IVAL(data);
 		data = &ival;
 #endif
 	case PIOCCONT:
 		if (p->p_step == 0)
 			break;
 		sig = *(unsigned int *)data;
 		if (sig != 0 && !_SIG_VALID(sig)) {
 			error = EINVAL;
 			break;
 		}
 #if 0
 		p->p_step = 0;
 		if (P_SHOULDSTOP(p)) {
 			p->p_xsig = sig;
 			p->p_flag &= ~(P_STOPPED_TRACE|P_STOPPED_SIG);
 			PROC_SLOCK(p);
 			thread_unsuspend(p);
 			PROC_SUNLOCK(p);
 		} else if (sig)
 			kern_psignal(p, sig);
 #else
 		if (sig)
 			kern_psignal(p, sig);
 		p->p_step = 0;
 		wakeup(&p->p_step);
 #endif
 		break;
 	default:
 		error = (ENOTTY);
 	}
 
 	return (error);
 }
 
 /*
  * Clean up on last close
  */
 int
 procfs_close(PFS_CLOSE_ARGS)
 {
 	if (p != NULL && (p->p_pfsflags & PF_LINGER) == 0) {
 		PROC_LOCK_ASSERT(p, MA_OWNED);
 		p->p_pfsflags = 0;
 		p->p_stops = 0;
 		p->p_step = 0;
 		wakeup(&p->p_step);
 	}
 	return (0);
 }
Index: stable/11/sys/sys/pioctl.h
===================================================================
--- stable/11/sys/sys/pioctl.h	(revision 361019)
+++ stable/11/sys/sys/pioctl.h	(revision 361020)
@@ -1,79 +1,83 @@
 /*-
  * Copyright 1997 Sean Eric Fagan
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by Sean Eric Fagan
  * 4. Neither the name of the author may be used to endorse or promote
  *    products derived from this software without specific prior written
  *    permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  */
 
 /*
  * procfs ioctl definitions.
  *
  * $FreeBSD$
  */
 
 #ifndef _SYS_PIOCTL_H
 # define _SYS_PIOCTL_H
 
+#ifndef _KERNEL
+#warning "<sys/pioctl.h> is deprecated, ptrace() should be used instead"
+#endif
+
 # include <sys/ioccom.h>
 
 struct procfs_status {
 	int	state;	/* Running, stopped, something else? */
 	int	flags;	/* Any flags */
 	unsigned long	events;	/* Events to stop on */
 	int	why;	/* What event, if any, proc stopped on */
 	unsigned long	val;	/* Any extra data */
 };
 
 # define	PIOCBIS	_IOWINT('p', 1)	/* Set event flag */
 # define	PIOCBIC	_IOWINT('p', 2)	/* Clear event flag */
 # define	PIOCSFL	_IOWINT('p', 3)	/* Set flags */
 			/* wait for proc to stop */
 # define	PIOCWAIT	_IOR('p', 4, struct procfs_status)
 # define	PIOCCONT	_IOWINT('p', 5)	/* Continue a process */
 			/* Get proc status */
 # define	PIOCSTATUS	_IOR('p', 6, struct procfs_status)
 # define	PIOCGFL	_IOR('p', 7, unsigned int)	/* Get flags */
 
 # define	S_EXEC	0x00000001	/* stop-on-exec */
 # define	S_SIG	0x00000002	/* stop-on-signal */
 # define	S_SCE	0x00000004	/* stop on syscall entry */
 # define	S_SCX	0x00000008	/* stop on syscall exit */
 # define	S_CORE	0x00000010	/* stop on coredump */
 # define	S_EXIT	0x00000020	/* stop on exit */
 # define	S_ALLSTOPS  0x003f	/* stop on all events */
 
 /*
  * If PF_LINGER is set in procp->p_pfsflags, then the last close
  * of a /proc/<pid>/mem file will not clear out the stops and continue
  * the process.
  */
 
 # define PF_LINGER	0x01	/* Keep stops around after last close */
 # define PF_ISUGID	0x02	/* Ignore UID/GID changes */
 # define PF_FORK	0x04	/* Retain settings on fork() */
 #endif 
Index: stable/11/usr.sbin/procctl/Makefile
===================================================================
--- stable/11/usr.sbin/procctl/Makefile	(revision 361019)
+++ stable/11/usr.sbin/procctl/Makefile	(revision 361020)
@@ -1,6 +1,14 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PROG=	procctl
 MAN=	procctl.8
+
+# Ignore deprecation warning in <sys/pioctl.h>
+CFLAGS.clang+= -Wno-\#warnings
+.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40700
+CFLAGS.gcc+= -Wno-cpp
+.endif
 
 .include <bsd.prog.mk>
Index: stable/11
===================================================================
--- stable/11	(revision 361019)
+++ stable/11	(revision 361020)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r359047,359054
Index: stable/12/lib/libsysdecode/Makefile
===================================================================
--- stable/12/lib/libsysdecode/Makefile	(revision 361019)
+++ stable/12/lib/libsysdecode/Makefile	(revision 361020)
@@ -1,145 +1,152 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PACKAGE=lib${LIB}
 LIB=	sysdecode
 
 SRCS=	errno.c flags.c ioctl.c signal.c syscallnames.c utrace.c
 INCS=	sysdecode.h
 
 CFLAGS+= -I${.OBJDIR}
 CFLAGS+= -I${SRCTOP}/sys
 CFLAGS+= -I${SRCTOP}/libexec/rtld-elf
 
 MAN=	sysdecode.3 \
 	sysdecode_abi_to_freebsd_errno.3 \
 	sysdecode_cap_rights.3 \
 	sysdecode_cmsg_type.3 \
 	sysdecode_enum.3 \
 	sysdecode_fcntl_arg.3 \
 	sysdecode_kevent.3 \
 	sysdecode_ioctlname.3 \
 	sysdecode_mask.3 \
 	sysdecode_quotactl_cmd.3 \
 	sysdecode_sctp_sinfo_flags.3 \
 	sysdecode_sigcode.3 \
 	sysdecode_sockopt_name.3 \
 	sysdecode_socket_protocol.3 \
 	sysdecode_syscallnames.3 \
 	sysdecode_utrace.3
 MLINKS= sysdecode_abi_to_freebsd_errno.3 sysdecode_freebsd_to_abi_errno.3
 MLINKS+=sysdecode_enum.3 sysdecode_acltype.3 \
 	sysdecode_enum.3 sysdecode_atfd.3 \
 	sysdecode_enum.3 sysdecode_extattrnamespace.3 \
 	sysdecode_enum.3 sysdecode_fadvice.3 \
 	sysdecode_enum.3 sysdecode_fcntl_cmd.3 \
 	sysdecode_enum.3 sysdecode_getfsstat_mode.3 \
 	sysdecode_enum.3 sysdecode_getrusage_who.3 \
 	sysdecode_enum.3 sysdecode_idtype.3 \
 	sysdecode_enum.3 sysdecode_ipproto.3 \
 	sysdecode_enum.3 sysdecode_kldsym_cmd.3 \
 	sysdecode_enum.3 sysdecode_kldunload_flags.3 \
 	sysdecode_enum.3 sysdecode_lio_listio_mode.3 \
 	sysdecode_enum.3 sysdecode_madvice.3 \
 	sysdecode_enum.3 sysdecode_minherit_flags.3 \
 	sysdecode_enum.3 sysdecode_msgctl_cmd.3 \
 	sysdecode_enum.3 sysdecode_nfssvc_flags.3 \
 	sysdecode_enum.3 sysdecode_pathconf_name.3 \
 	sysdecode_enum.3 sysdecode_prio_which.3 \
 	sysdecode_enum.3 sysdecode_procctl_cmd.3 \
 	sysdecode_enum.3 sysdecode_ptrace_request.3 \
 	sysdecode_enum.3 sysdecode_rlimit.3 \
 	sysdecode_enum.3 sysdecode_rtprio_function.3 \
 	sysdecode_enum.3 sysdecode_scheduler_policy.3 \
 	sysdecode_enum.3 sysdecode_sctp_pr_policy.3 \
 	sysdecode_enum.3 sysdecode_semctl_cmd.3 \
 	sysdecode_enum.3 sysdecode_shmctl_cmd.3 \
 	sysdecode_enum.3 sysdecode_shutdown_how.3 \
 	sysdecode_enum.3 sysdecode_sigbus_code.3 \
 	sysdecode_enum.3 sysdecode_sigchld_code.3 \
 	sysdecode_enum.3 sysdecode_sigfpe_code.3 \
 	sysdecode_enum.3 sysdecode_sigill_code.3 \
 	sysdecode_enum.3 sysdecode_signal.3 \
 	sysdecode_enum.3 sysdecode_sigprocmask_how.3 \
 	sysdecode_enum.3 sysdecode_sigsegv_code.3 \
 	sysdecode_enum.3 sysdecode_sigtrap_code.3 \
 	sysdecode_enum.3 sysdecode_sockaddr_family.3 \
 	sysdecode_enum.3 sysdecode_socketdomain.3 \
 	sysdecode_enum.3 sysdecode_sockettype.3 \
 	sysdecode_enum.3 sysdecode_sockopt_level.3 \
 	sysdecode_enum.3 sysdecode_sysarch_number.3 \
 	sysdecode_enum.3 sysdecode_umtx_op.3 \
 	sysdecode_enum.3 sysdecode_vmresult.3 \
 	sysdecode_enum.3 sysdecode_whence.3
 MLINKS+=sysdecode_fcntl_arg.3 sysdecode_fcntl_arg_p.3
 MLINKS+=sysdecode_kevent.3 sysdecode_kevent_fflags.3 \
 	sysdecode_kevent.3 sysdecode_kevent_filter.3 \
 	sysdecode_kevent.3 sysdecode_kevent_flags.3
 MLINKS+=sysdecode_mask.3 sysdecode_accessmode.3 \
 	sysdecode_mask.3 sysdecode_atflags.3 \
 	sysdecode_mask.3 sysdecode_capfcntlrights.3 \
 	sysdecode_mask.3 sysdecode_fcntl_fileflags.3 \
 	sysdecode_mask.3 sysdecode_fileflags.3 \
 	sysdecode_mask.3 sysdecode_filemode.3 \
 	sysdecode_mask.3 sysdecode_flock_operation.3 \
 	sysdecode_mask.3 sysdecode_mlockall_flags.3 \
 	sysdecode_mask.3 sysdecode_mmap_flags.3 \
 	sysdecode_mask.3 sysdecode_mmap_prot.3 \
 	sysdecode_mask.3 sysdecode_mount_flags.3 \
 	sysdecode_mask.3 sysdecode_msg_flags.3 \
 	sysdecode_mask.3 sysdecode_msync_flags.3 \
 	sysdecode_mask.3 sysdecode_open_flags.3 \
 	sysdecode_mask.3 sysdecode_pipe2_flags.3 \
 	sysdecode_mask.3 sysdecode_reboot_howto.3 \
 	sysdecode_mask.3 sysdecode_rfork_flags.3 \
 	sysdecode_mask.3 sysdecode_semget_flags.3 \
 	sysdecode_mask.3 sysdecode_sendfile_flags.3 \
 	sysdecode_mask.3 sysdecode_shmat_flags.3 \
 	sysdecode_mask.3 sysdecode_sctp_nxt_flags.3 \
 	sysdecode_mask.3 sysdecode_sctp_rcv_flags.3 \
 	sysdecode_mask.3 sysdecode_sctp_snd_flags.3 \
 	sysdecode_mask.3 sysdecode_socket_type.3 \
 	sysdecode_mask.3 sysdecode_thr_create_flags.3 \
 	sysdecode_mask.3 sysdecode_umtx_cvwait_flags.3 \
 	sysdecode_mask.3 sysdecode_umtx_rwlock_flags.3 \
 	sysdecode_mask.3 sysdecode_vmprot.3 \
 	sysdecode_mask.3 sysdecode_wait4_options.3 \
 	sysdecode_mask.3 sysdecode_wait6_options.3
 
 CLEANFILES= ioctl.c ioctl.c.tmp tables.h
 
 .if defined(COMPAT_32BIT)
 CPP+=	-m32
 .endif
 
 .if ${MK_PF} != "no"
 CFLAGS+=-DPF
 .endif
 
 # Workaround duplicate declarations in <netinet/ip_compat.h>
 CFLAGS.gcc.ioctl.c+= -Wno-redundant-decls
 
+# Ignore deprecation warning in <sys/pioctl.h>
+CFLAGS.clang.ioctl.c+= -Wno-\#warnings
+.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40700
+CFLAGS.gcc.ioctl.c+= -Wno-cpp
+.endif
+
+CFLAGS.clang+=	${CFLAGS.clang.${.IMPSRC}}
 CFLAGS.gcc+=	${CFLAGS.gcc.${.IMPSRC}}
 
 DEPENDOBJS+=	tables.h
 tables.h: mktables
 	sh ${.CURDIR}/mktables ${SYSROOT:U${DESTDIR}}${INCLUDEDIR} ${.TARGET}
 
 # mkioctls runs find(1) for headers so needs to rebuild every time.  This used
 # to be a hack only done in buildworld.
 .if !defined(_SKIP_BUILD)
 ioctl.c.tmp: .PHONY
 .endif
 ioctl.c.tmp: mkioctls .META
 	env CPP="${CPP}" MK_PF="${MK_PF}" \
 	    /bin/sh ${.CURDIR}/mkioctls ${SYSROOT:U${DESTDIR}}${INCLUDEDIR} > ${.TARGET}
 
 ioctl.c: ioctl.c.tmp
 	if [ ! -e ${.TARGET} ] || ! cmp -s ${.TARGET} ${.TARGET}.tmp; then \
 		mv -f ${.TARGET}.tmp ${.TARGET}; \
 	fi
 
 beforedepend: ioctl.c tables.h
 
 .include <bsd.lib.mk>
Index: stable/12/sys/fs/procfs/procfs_ioctl.c
===================================================================
--- stable/12/sys/fs/procfs/procfs_ioctl.c	(revision 361019)
+++ stable/12/sys/fs/procfs/procfs_ioctl.c	(revision 361020)
@@ -1,220 +1,263 @@
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Copyright (c) 2001 Dag-Erling Coïdan Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer
  *    in this position and unchanged.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *      $FreeBSD$
  */
 
 #include <sys/param.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/pioctl.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/systm.h>
 
 #include <fs/pseudofs/pseudofs.h>
 #include <fs/procfs/procfs.h>
 
 #ifdef COMPAT_FREEBSD32
 struct procfs_status32 {
 	int	state;	/* Running, stopped, something else? */
 	int	flags;	/* Any flags */
 	unsigned int	events;	/* Events to stop on */
 	int	why;	/* What event, if any, proc stopped on */
 	unsigned int	val;	/* Any extra data */
 };
 
 #define	PIOCWAIT32	_IOR('p', 4, struct procfs_status32)
 #define	PIOCSTATUS32	_IOR('p', 6, struct procfs_status32)
 #endif
 
 /*
  * Process ioctls
  */
 int
 procfs_ioctl(PFS_IOCTL_ARGS)
 {
 	struct procfs_status *ps;
 #ifdef COMPAT_FREEBSD32
 	struct procfs_status32 *ps32;
 #endif
 	int error, flags, sig;
 #ifdef COMPAT_FREEBSD6
 	int ival;
 #endif
+	static struct timeval lasttime;
+	static struct timeval interval = { .tv_sec = 1, .tv_usec = 0 };
 
 	KASSERT(p != NULL,
 	    ("%s() called without a process", __func__));
 	PROC_LOCK_ASSERT(p, MA_OWNED);
+
+	switch (cmd) {
+#if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
+	case _IOC(IOC_IN, 'p', 1, 0):
+#endif
+#ifdef COMPAT_FREEBSD6
+	case _IO('p', 1):
+#endif
+	case PIOCBIS:
+#if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
+	case _IOC(IOC_IN, 'p', 2, 0):
+#endif
+#ifdef COMPAT_FREEBSD6
+	case _IO('p', 2):
+#endif
+	case PIOCBIC:
+#if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
+	case _IOC(IOC_IN, 'p', 3, 0):
+#endif
+#ifdef COMPAT_FREEBSD6
+	case _IO('p', 3):
+#endif
+	case PIOCSFL:
+	case PIOCGFL:
+	case PIOCWAIT:
+	case PIOCSTATUS:
+#ifdef COMPAT_FREEBSD32
+	case PIOCWAIT32:
+	case PIOCSTATUS32:
+#endif
+#if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
+	case _IOC(IOC_IN, 'p', 5, 0):
+#endif
+#ifdef COMPAT_FREEBSD6
+	case _IO('p', 5):
+#endif
+	case PIOCCONT:
+		if (ratecheck(&lasttime, &interval) != 0)
+			gone_in(13, "procfs-based process debugging");
+		break;
+	}
 
 	error = 0;
 	switch (cmd) {
 #if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
 	case _IOC(IOC_IN, 'p', 1, 0):
 #endif
 #ifdef COMPAT_FREEBSD6
 	case _IO('p', 1):
 		ival = IOCPARM_IVAL(data);
 		data = &ival;
 #endif
 	case PIOCBIS:
 		p->p_stops |= *(unsigned int *)data;
 		break;
 #if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
 	case _IOC(IOC_IN, 'p', 2, 0):
 #endif
 #ifdef COMPAT_FREEBSD6
 	case _IO('p', 2):
 		ival = IOCPARM_IVAL(data);
 		data = &ival;
 #endif
 	case PIOCBIC:
 		p->p_stops &= ~*(unsigned int *)data;
 		break;
 #if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
 	case _IOC(IOC_IN, 'p', 3, 0):
 #endif
 #ifdef COMPAT_FREEBSD6
 	case _IO('p', 3):
 		ival = IOCPARM_IVAL(data);
 		data = &ival;
 #endif
 	case PIOCSFL:
 		flags = *(unsigned int *)data;
 		if (flags & PF_ISUGID) {
 			/*
 			 * XXXRW: Is this specific check required here, as
 			 * p_candebug() should implement it, or other checks
 			 * are missing.
 			 */
 			error = priv_check(td, PRIV_DEBUG_SUGID);
 			if (error)
 				break;
 		}
 		p->p_pfsflags = flags;
 		break;
 	case PIOCGFL:
 		*(unsigned int *)data = p->p_pfsflags;
 		break;
 	case PIOCWAIT:
 		while (p->p_step == 0 && (p->p_flag & P_WEXIT) == 0) {
 			/* sleep until p stops */
 			_PHOLD(p);
 			error = msleep(&p->p_stype, &p->p_mtx,
 			    PWAIT|PCATCH, "pioctl", 0);
 			_PRELE(p);
 			if (error != 0)
 				break;
 		}
 		/* fall through to PIOCSTATUS */
 	case PIOCSTATUS:
 		ps = (struct procfs_status *)data;
 		ps->state = (p->p_step == 0);
 		ps->flags = 0; /* nope */
 		ps->events = p->p_stops;
 		ps->why = p->p_step ? p->p_stype : 0;
 		ps->val = p->p_step ? p->p_xsig : 0;
 		break;
 #ifdef COMPAT_FREEBSD32
 	case PIOCWAIT32:
 		while (p->p_step == 0 && (p->p_flag & P_WEXIT) == 0) {
 			/* sleep until p stops */
 			_PHOLD(p);
 			error = msleep(&p->p_stype, &p->p_mtx,
 			    PWAIT|PCATCH, "pioctl", 0);
 			_PRELE(p);
 			if (error != 0)
 				break;
 		}
 		/* fall through to PIOCSTATUS32 */
 	case PIOCSTATUS32:
 		ps32 = (struct procfs_status32 *)data;
 		ps32->state = (p->p_step == 0);
 		ps32->flags = 0; /* nope */
 		ps32->events = p->p_stops;
 		ps32->why = p->p_step ? p->p_stype : 0;
 		ps32->val = p->p_step ? p->p_xsig : 0;
 		break;
 #endif
 #if defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
 	case _IOC(IOC_IN, 'p', 5, 0):
 #endif
 #ifdef COMPAT_FREEBSD6
 	case _IO('p', 5):
 		ival = IOCPARM_IVAL(data);
 		data = &ival;
 #endif
 	case PIOCCONT:
 		if (p->p_step == 0)
 			break;
 		sig = *(unsigned int *)data;
 		if (sig != 0 && !_SIG_VALID(sig)) {
 			error = EINVAL;
 			break;
 		}
 #if 0
 		p->p_step = 0;
 		if (P_SHOULDSTOP(p)) {
 			p->p_xsig = sig;
 			p->p_flag &= ~(P_STOPPED_TRACE|P_STOPPED_SIG);
 			PROC_SLOCK(p);
 			thread_unsuspend(p);
 			PROC_SUNLOCK(p);
 		} else if (sig)
 			kern_psignal(p, sig);
 #else
 		if (sig)
 			kern_psignal(p, sig);
 		p->p_step = 0;
 		wakeup(&p->p_step);
 #endif
 		break;
 	default:
 		error = (ENOTTY);
 	}
 
 	return (error);
 }
 
 /*
  * Clean up on last close
  */
 int
 procfs_close(PFS_CLOSE_ARGS)
 {
 	if (p != NULL && (p->p_pfsflags & PF_LINGER) == 0) {
 		PROC_LOCK_ASSERT(p, MA_OWNED);
 		p->p_pfsflags = 0;
 		p->p_stops = 0;
 		p->p_step = 0;
 		wakeup(&p->p_step);
 	}
 	return (0);
 }
Index: stable/12/sys/sys/pioctl.h
===================================================================
--- stable/12/sys/sys/pioctl.h	(revision 361019)
+++ stable/12/sys/sys/pioctl.h	(revision 361020)
@@ -1,81 +1,85 @@
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
  *
  * Copyright 1997 Sean Eric Fagan
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by Sean Eric Fagan
  * 4. Neither the name of the author may be used to endorse or promote
  *    products derived from this software without specific prior written
  *    permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  */
 
 /*
  * procfs ioctl definitions.
  *
  * $FreeBSD$
  */
 
 #ifndef _SYS_PIOCTL_H
 # define _SYS_PIOCTL_H
 
+#ifndef _KERNEL
+#warning "<sys/pioctl.h> is deprecated, ptrace() should be used instead"
+#endif
+
 # include <sys/ioccom.h>
 
 struct procfs_status {
 	int	state;	/* Running, stopped, something else? */
 	int	flags;	/* Any flags */
 	unsigned long	events;	/* Events to stop on */
 	int	why;	/* What event, if any, proc stopped on */
 	unsigned long	val;	/* Any extra data */
 };
 
 # define	PIOCBIS	_IOWINT('p', 1)	/* Set event flag */
 # define	PIOCBIC	_IOWINT('p', 2)	/* Clear event flag */
 # define	PIOCSFL	_IOWINT('p', 3)	/* Set flags */
 			/* wait for proc to stop */
 # define	PIOCWAIT	_IOR('p', 4, struct procfs_status)
 # define	PIOCCONT	_IOWINT('p', 5)	/* Continue a process */
 			/* Get proc status */
 # define	PIOCSTATUS	_IOR('p', 6, struct procfs_status)
 # define	PIOCGFL	_IOR('p', 7, unsigned int)	/* Get flags */
 
 # define	S_EXEC	0x00000001	/* stop-on-exec */
 # define	S_SIG	0x00000002	/* stop-on-signal */
 # define	S_SCE	0x00000004	/* stop on syscall entry */
 # define	S_SCX	0x00000008	/* stop on syscall exit */
 # define	S_CORE	0x00000010	/* stop on coredump */
 # define	S_EXIT	0x00000020	/* stop on exit */
 # define	S_ALLSTOPS  0x003f	/* stop on all events */
 
 /*
  * If PF_LINGER is set in procp->p_pfsflags, then the last close
  * of a /proc/<pid>/mem file will not clear out the stops and continue
  * the process.
  */
 
 # define PF_LINGER	0x01	/* Keep stops around after last close */
 # define PF_ISUGID	0x02	/* Ignore UID/GID changes */
 # define PF_FORK	0x04	/* Retain settings on fork() */
 #endif 
Index: stable/12
===================================================================
--- stable/12	(revision 361019)
+++ stable/12	(revision 361020)

Property changes on: stable/12
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r359047,359054