From owner-freebsd-pf@FreeBSD.ORG  Tue Jun 28 21:00:37 2005
Return-Path: <owner-freebsd-pf@FreeBSD.ORG>
X-Original-To: freebsd-pf@hub.freebsd.org
Delivered-To: freebsd-pf@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D3A1116A41C
	for <freebsd-pf@hub.freebsd.org>; Tue, 28 Jun 2005 21:00:37 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BEE6B43D49
	for <freebsd-pf@hub.freebsd.org>; Tue, 28 Jun 2005 21:00:37 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j5SL0bhV063765
	for <freebsd-pf@freefall.freebsd.org>; Tue, 28 Jun 2005 21:00:37 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j5SL0bmv063764;
	Tue, 28 Jun 2005 21:00:37 GMT (envelope-from gnats)
Date: Tue, 28 Jun 2005 21:00:37 GMT
Message-Id: <200506282100.j5SL0bmv063764@freefall.freebsd.org>
To: freebsd-pf@FreeBSD.org
From: Andrew Thompson <thompsa@freebsd.org>
Cc: 
Subject: Re: ia64/81284: Unaligned Reference with pf on 5.4/IA64
X-BeenThere: freebsd-pf@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Andrew Thompson <thompsa@freebsd.org>
List-Id: "Technical discussion and general questions about packet filter
	\(pf\)" <freebsd-pf.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-pf>,
	<mailto:freebsd-pf-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-pf>
List-Post: <mailto:freebsd-pf@freebsd.org>
List-Help: <mailto:freebsd-pf-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-pf>,
	<mailto:freebsd-pf-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Jun 2005 21:00:37 -0000

The following reply was made to PR ia64/81284; it has been noted by GNATS.

From: Andrew Thompson <thompsa@freebsd.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ia64/81284: Unaligned Reference with pf on 5.4/IA64
Date: Wed, 29 Jun 2005 08:50:18 +1200

 A complementary patch for bridge.c using the same macros and routines as
 if_bridge. As far as I can tell ipv6 isn't filtered.
 
 
 Index: bridge.c
 ===================================================================
 RCS file: /home/ncvs/src/sys/net/bridge.c,v
 retrieving revision 1.92
 diff -u -r1.92 bridge.c
 --- bridge.c	10 Jun 2005 16:49:18 -0000	1.92
 +++ bridge.c	28 Jun 2005 20:44:10 -0000
 @@ -1026,6 +1026,19 @@
  	m_adj(m0, ETHER_HDR_LEN);		/* temporarily strip header */
  
  	/*
 +	 * Check that the IP header is aligned before passing up to the packet
 +	 * filter.
 +	 */
 +	if (ntohs(save_eh.ether_type) == ETHERTYPE_IP && 
 +	    IP_HDR_ALIGNED_P(mtod(m0, caddr_t)) == 0) {
 +		if ((m = m_copyup(m0, sizeof(struct ip),
 +			(max_linkhdr + 3) & ~3)) == NULL) {
 +			bdg_dropped++;
 +			return NULL;
 +		}
 +	}
 +
 +	/*
  	 * NetBSD-style generic packet filter, pfil(9), hooks.
  	 * Enables ipf(8) in bridging.
  	 */