From owner-p4-projects@FreeBSD.ORG  Tue Feb  6 16:42:46 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 760CD16A408; Tue,  6 Feb 2007 16:42:46 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 51AC516A406
	for <perforce@freebsd.org>; Tue,  6 Feb 2007 16:42:46 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 41DC013C4AA
	for <perforce@freebsd.org>; Tue,  6 Feb 2007 16:42:46 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l16GgkHQ006756
	for <perforce@freebsd.org>; Tue, 6 Feb 2007 16:42:46 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l16GgkJD006753
	for perforce@freebsd.org; Tue, 6 Feb 2007 16:42:46 GMT
	(envelope-from piso@freebsd.org)
Date: Tue, 6 Feb 2007 16:42:46 GMT
Message-Id: <200702061642.l16GgkJD006753@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 114111 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, 06 Feb 2007 16:42:46 -0000

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

Change 114111 by piso@piso_newluxor on 2007/02/06 16:42:05

	Before checking for IP_MF, pullup at least the ip hdr.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#56 edit

Differences ...

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#56 (text+ko) ====

@@ -1346,11 +1346,15 @@
 			iresult = ProtoAliasIn(la, pip);
 			break;
 		}
-
+		
+		PULLUP_IPHDR(pip, ptr);
+		if (pip == NULL)
+			return (PKT_ALIAS_IGNORED);
 		if (ntohs(pip->ip_off) & IP_MF) {
 			struct alias_link *lnk;
-
-			lnk = FindFragmentIn1(la, pip->ip_src, alias_addr, pip->ip_id);
+			
+			lnk = FindFragmentIn1(la, pip->ip_src, alias_addr, 
+			    pip->ip_id);
 			if (lnk != NULL) {
 				iresult = PKT_ALIAS_FOUND_HEADER_FRAGMENT;
 				SetFragmentAddr(lnk, pip->ip_dst);