From owner-svn-src-all@FreeBSD.ORG  Tue Jun 28 00:58:12 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 7FD8F106566B;
	Tue, 28 Jun 2011 00:58:12 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 700168FC1C;
	Tue, 28 Jun 2011 00:58:12 +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 p5S0wCsf021419;
	Tue, 28 Jun 2011 00:58:12 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5S0wC9I021417;
	Tue, 28 Jun 2011 00:58:12 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201106280058.p5S0wC9I021417@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 28 Jun 2011 00:58:12 +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: r223616 - head/contrib/libpcap/bpf/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: Tue, 28 Jun 2011 00:58:12 -0000

Author: delphij
Date: Tue Jun 28 00:58:12 2011
New Revision: 223616
URL: http://svn.freebsd.org/changeset/base/223616

Log:
  Incorporate vendor commit ecdc5c0a7f7591a7cd4a:
  
  In userland, sign extend the offset for JA instructions.
  
  We currently use that to implement "ip6 protochain", and "pc" might be
  wider than "pc->k", in which case we need to arrange that "pc->k" be
  sign-extended, by casting it to bpf_int32.
  
  PR:		kern/157188
  Submitted by:	plosher
  MFC after:	2 weeks

Modified:
  head/contrib/libpcap/bpf/net/bpf_filter.c

Modified: head/contrib/libpcap/bpf/net/bpf_filter.c
==============================================================================
--- head/contrib/libpcap/bpf/net/bpf_filter.c	Tue Jun 28 00:01:55 2011	(r223615)
+++ head/contrib/libpcap/bpf/net/bpf_filter.c	Tue Jun 28 00:58:12 2011	(r223616)
@@ -405,7 +405,18 @@ bpf_filter(pc, p, wirelen, buflen)
 			continue;
 
 		case BPF_JMP|BPF_JA:
+#if defined(KERNEL) || defined(_KERNEL)
+			/*
+			 * No backward jumps allowed.
+			 */
 			pc += pc->k;
+#else
+			/*
+			 * XXX - we currently implement "ip6 protochain"
+			 * with backward jumps, so sign-extend pc->k.
+			 */
+			pc += (bpf_int32)pc->k;
+#endif
 			continue;
 
 		case BPF_JMP|BPF_JGT|BPF_K: