From owner-svn-src-all@FreeBSD.ORG  Thu Jul 14 21:06:23 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2573F106564A;
	Thu, 14 Jul 2011 21:06:23 +0000 (UTC) (envelope-from mp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 163CB8FC12;
	Thu, 14 Jul 2011 21:06:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6EL6MRq045968;
	Thu, 14 Jul 2011 21:06:22 GMT (envelope-from mp@svn.freebsd.org)
Received: (from mp@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6EL6MmJ045966;
	Thu, 14 Jul 2011 21:06:22 GMT (envelope-from mp@svn.freebsd.org)
Message-Id: <201107142106.p6EL6MmJ045966@svn.freebsd.org>
From: Mark Peek <mp@FreeBSD.org>
Date: Thu, 14 Jul 2011 21:06:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224044 - head/sys/net
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Jul 2011 21:06:23 -0000

Author: mp
Date: Thu Jul 14 21:06:22 2011
New Revision: 224044
URL: http://svn.freebsd.org/changeset/base/224044

Log:
  Clear the filter memory area before using it. Leaving it uninitialized may
  leak previous kernel stack contents through a malicioius BPF filter.
  
  PR:		kern/158880
  Submitted by:	Guy Harris
  Obtained from:	OpenBSD
  MFC after:	1 week

Modified:
  head/sys/net/bpf_filter.c

Modified: head/sys/net/bpf_filter.c
==============================================================================
--- head/sys/net/bpf_filter.c	Thu Jul 14 21:02:15 2011	(r224043)
+++ head/sys/net/bpf_filter.c	Thu Jul 14 21:06:22 2011	(r224044)
@@ -177,6 +177,8 @@ bpf_filter(const struct bpf_insn *pc, u_
 	bpf_u_int32 k;
 	u_int32_t mem[BPF_MEMWORDS];
 
+	bzero(mem, sizeof(mem));
+
 	if (pc == NULL)
 		/*
 		 * No filter means accept all.