From owner-p4-projects@FreeBSD.ORG  Tue Mar 11 16:39:35 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 536A51065674; Tue, 11 Mar 2008 16:39:35 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 13057106566B
	for <perforce@freebsd.org>; Tue, 11 Mar 2008 16:39:35 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E00598FC12
	for <perforce@freebsd.org>; Tue, 11 Mar 2008 16:39:34 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2BGdYcw082872
	for <perforce@freebsd.org>; Tue, 11 Mar 2008 16:39:34 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BGdYVV082870
	for perforce@freebsd.org; Tue, 11 Mar 2008 16:39:34 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 11 Mar 2008 16:39:34 GMT
Message-Id: <200803111639.m2BGdYVV082870@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 137413 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Mar 2008 16:39:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=137413

Change 137413 by rwatson@rwatson_cinnamon on 2008/03/11 16:38:52

	Don't print BPF descriptor data if we have the wrong structure
	size/version, as it may be garbage.

Affected files ...

.. //depot/projects/zcopybpf/src/usr.sbin/netstat/bpf.c#8 edit

Differences ...

==== //depot/projects/zcopybpf/src/usr.sbin/netstat/bpf.c#8 (text+ko) ====

@@ -127,6 +127,10 @@
 	if (bpf_get_stats(&size, &bd) < 0)
 		return;
 	for (d = &bd[0]; d < &bd[size / sizeof(*d)]; d++) {
+		if (d->bd_structsize != sizeof(*d)) {
+			warnx("bpf_stats_extended: version mismatch");
+			return;
+		}
 		if (ifname && strcmp(ifname, d->bd_ifname) != 0)
 			continue;
 		pname = bpf_pidname(d->bd_pid);
@@ -169,6 +173,10 @@
 	    "Pid", "Netif", "Flags", "Recv", "Drop", "Match", "Sblen",
 	    "Hblen", "Command");
 	for (d = &bd[0]; d < &bd[size / sizeof(*d)]; d++) {
+		if (d->bd_structsize != sizeof(*d)) {
+			warnx("bpf_stats_extended: version mismatch");
+			return;
+		}
 		if (ifname && strcmp(ifname, d->bd_ifname) != 0)
 			continue;
 		bpf_flags(d, flagbuf);