4 files changed, 28 insertions, 17 deletions

diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 0c37a7a02172..5b6dd2f2f641 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf.c	8.2 (Berkeley) 3/28/94
  *
- * $Id: bpf.c,v 1.47 1999/01/27 22:42:13 dillon Exp $
+ * $Id: bpf.c,v 1.48 1999/04/28 01:18:13 msmith Exp $
  */
 
 #include "bpfilter.h"
@@ -346,6 +346,9 @@ bpfopen(dev, flags, fmt, p)
 {
 	register struct bpf_d *d;
 
+	if (p->p_prison)
+		return (EPERM);
+
 	if (minor(dev) >= NBPFILTER)
 		return (ENXIO);
 	/*
@@ -1014,12 +1017,12 @@ bpfpoll(dev, events, p)
 	d = &bpf_dtab[minor(dev)];
 
 	s = splimp();
-	if (events & (POLLIN | POLLRDNORM))
+	if (events & (POLLIN | POLLRDNORM)) {
 		if (d->bd_hlen != 0 || (d->bd_immediate && d->bd_slen != 0))
 			revents |= events & (POLLIN | POLLRDNORM);
 		else
 			selrecord(p, &d->bd_sel);
-
+	}
 	splx(s);
 	return (revents);
 }
diff --git a/sys/net/if.c b/sys/net/if.c
index bb36fa4b976d..e91445e945ac 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.c	8.3 (Berkeley) 1/4/94
- *	$Id: if.c,v 1.68 1999/04/26 09:02:40 peter Exp $
+ *	$Id: if.c,v 1.69 1999/04/27 11:16:56 phk Exp $
  */
 
 #include "opt_compat.h"
@@ -857,7 +857,7 @@ ifconf(cmd, data)
 	ifrp = ifc->ifc_req;
 	for (; space > sizeof (ifr) && ifp; ifp = ifp->if_link.tqe_next) {
 		char workbuf[64];
-		int ifnlen;
+		int ifnlen, addrs;
 
 		ifnlen = snprintf(workbuf, sizeof(workbuf),
 		    "%s%d", ifp->if_name, ifp->if_unit);
@@ -867,17 +867,14 @@ ifconf(cmd, data)
 			strcpy(ifr.ifr_name, workbuf);
 		}
 
-		if ((ifa = ifp->if_addrhead.tqh_first) == 0) {
-			bzero((caddr_t)&ifr.ifr_addr, sizeof(ifr.ifr_addr));
-			error = copyout((caddr_t)&ifr, (caddr_t)ifrp,
-			    sizeof (ifr));
-			if (error)
-				break;
-			space -= sizeof (ifr), ifrp++;
-		} else
-		    for ( ; space > sizeof (ifr) && ifa; 
-			 ifa = ifa->ifa_link.tqe_next) {
+		addrs = 0;
+		ifa = ifp->if_addrhead.tqh_first;
+		for ( ; space > sizeof (ifr) && ifa;
+		    ifa = ifa->ifa_link.tqe_next) {
 			register struct sockaddr *sa = ifa->ifa_addr;
+			if (curproc->p_prison && prison_if(curproc, sa))
+				continue;
+			addrs++;
 #ifdef COMPAT_43
 			if (cmd == OSIOCGIFCONF) {
 				struct osockaddr *osa =
@@ -910,6 +907,14 @@ ifconf(cmd, data)
 				break;
 			space -= sizeof (ifr);
 		}
+		if (!addrs) {
+			bzero((caddr_t)&ifr.ifr_addr, sizeof(ifr.ifr_addr));
+			error = copyout((caddr_t)&ifr, (caddr_t)ifrp,
+			    sizeof (ifr));
+			if (error)
+				break;
+			space -= sizeof (ifr), ifrp++;
+		}
 	}
 	ifc->ifc_len -= space;
 	return (error);
diff --git a/sys/net/if.h b/sys/net/if.h
index e4f0046a99ef..4ca06612d1df 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.h	8.1 (Berkeley) 6/10/93
- *	$Id: if.h,v 1.49 1998/03/21 13:36:20 peter Exp $
+ *	$Id: if.h,v 1.50 1999/02/19 13:41:35 phk Exp $
  */
 
 #ifndef _NET_IF_H_
@@ -221,6 +221,7 @@ MALLOC_DECLARE(M_IFMADDR);
 
 /* XXX - this should go away soon */
 #ifdef KERNEL
+int	prison_if __P((struct proc *p, struct sockaddr *sa));
 #include <net/if_var.h>
 #endif
 
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index bf5da6e18d4d..a57b518b2785 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)rtsock.c	8.5 (Berkeley) 11/2/94
- *	$Id: rtsock.c,v 1.37 1997/10/31 08:53:13 davidg Exp $
+ *	$Id: rtsock.c,v 1.38 1999/01/27 22:42:14 dillon Exp $
  */
 
 
@@ -911,6 +911,8 @@ sysctl_iflist(af, w)
 		while ((ifa = ifa->ifa_link.tqe_next) != 0) {
 			if (af && af != ifa->ifa_addr->sa_family)
 				continue;
+			if (curproc->p_prison && prison_if(curproc, ifa->ifa_addr))
+				continue;
 			ifaaddr = ifa->ifa_addr;
 			netmask = ifa->ifa_netmask;
 			brdaddr = ifa->ifa_dstaddr;