From owner-p4-projects@FreeBSD.ORG  Thu Jun  5 14:33:54 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 79463106566C; Thu,  5 Jun 2008 14:33:54 +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 3AA2D1065673
	for <perforce@freebsd.org>; Thu,  5 Jun 2008 14:33:54 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F313C8FC20
	for <perforce@freebsd.org>; Thu,  5 Jun 2008 14:33:53 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m55EXr2O025592
	for <perforce@freebsd.org>; Thu, 5 Jun 2008 14:33:53 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m55EXrtN025590
	for perforce@freebsd.org; Thu, 5 Jun 2008 14:33:53 GMT
	(envelope-from piso@freebsd.org)
Date: Thu, 5 Jun 2008 14:33:53 GMT
Message-Id: <200806051433.m55EXrtN025590@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 142968 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: Thu, 05 Jun 2008 14:33:54 -0000

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

Change 142968 by piso@piso_ferret on 2008/06/05 14:33:29

	In case megapullup fails, return ENOMEM.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#33 edit

Differences ...

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

@@ -232,14 +232,14 @@
 	int error;
 
 	LIBALIAS_RLOCK();
-	error = ENOENT;
+	error = 0;
 	LIST_FOREACH(p, &handler_chain, entries) {
 		if ((p->dir & dir) && (p->proto & proto))
 			if (p->fingerprint(la, ad) == 0) {
 #ifdef _KERNEL
 				*pkt = m_megapullup(*pkt, (*pkt)->m_pkthdr.len);
 				if (*pkt == NULL) {
-					error = EPERM;
+					error = ENOMEM;
 					break;
 				}
 				pip = mtod(*pkt, struct ip *);