From owner-freebsd-net@FreeBSD.ORG  Wed Mar 28 12:50:06 2012
Return-Path: <owner-freebsd-net@FreeBSD.ORG>
Delivered-To: freebsd-net@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 39BA9106566B
	for <freebsd-net@hub.freebsd.org>; Wed, 28 Mar 2012 12:50:06 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 03D438FC17
	for <freebsd-net@hub.freebsd.org>; Wed, 28 Mar 2012 12:50:06 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q2SCo5q4054010
	for <freebsd-net@freefall.freebsd.org>; Wed, 28 Mar 2012 12:50:05 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q2SCo5DZ054009;
	Wed, 28 Mar 2012 12:50:05 GMT (envelope-from gnats)
Date: Wed, 28 Mar 2012 12:50:05 GMT
Message-Id: <201203281250.q2SCo5DZ054009@freefall.freebsd.org>
To: freebsd-net@FreeBSD.org
From: dfilter@FreeBSD.ORG (dfilter service)
Cc: 
Subject: Re: kern/165643: commit references a PR
X-BeenThere: freebsd-net@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: dfilter service <dfilter@FreeBSD.ORG>
List-Id: Networking and TCP/IP with FreeBSD <freebsd-net.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-net>
List-Post: <mailto:freebsd-net@freebsd.org>
List-Help: <mailto:freebsd-net-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Mar 2012 12:50:06 -0000

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/165643: commit references a PR
Date: Wed, 28 Mar 2012 12:40:41 +0000 (UTC)

 Author: zec
 Date: Wed Mar 28 12:40:30 2012
 New Revision: 233602
 URL: http://svn.freebsd.org/changeset/base/233602
 
 Log:
   MFC: 232487
     Properly restore curvnet context when returning early from
     ether_input_internal().
   
     This change only affects options VIMAGE kernel builds.
   
     PR:           kern/165643
     Submitted by: Vijay Singh
     MFC after:    3 days
 
 Modified:
   stable/9/sys/net/if_ethersubr.c
 Directory Properties:
   stable/9/sys/   (props changed)
   stable/9/sys/amd64/include/xen/   (props changed)
   stable/9/sys/boot/   (props changed)
   stable/9/sys/boot/i386/efi/   (props changed)
   stable/9/sys/boot/ia64/efi/   (props changed)
   stable/9/sys/boot/ia64/ski/   (props changed)
   stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
   stable/9/sys/boot/powerpc/ofw/   (props changed)
   stable/9/sys/cddl/contrib/opensolaris/   (props changed)
   stable/9/sys/conf/   (props changed)
   stable/9/sys/contrib/dev/acpica/   (props changed)
   stable/9/sys/contrib/octeon-sdk/   (props changed)
   stable/9/sys/contrib/pf/   (props changed)
   stable/9/sys/contrib/x86emu/   (props changed)
   stable/9/sys/fs/   (props changed)
   stable/9/sys/fs/ntfs/   (props changed)
   stable/9/sys/i386/conf/XENHVM   (props changed)
 
 Modified: stable/9/sys/net/if_ethersubr.c
 ==============================================================================
 --- stable/9/sys/net/if_ethersubr.c	Wed Mar 28 12:30:16 2012	(r233601)
 +++ stable/9/sys/net/if_ethersubr.c	Wed Mar 28 12:40:30 2012	(r233602)
 @@ -661,8 +661,10 @@ ether_input_internal(struct ifnet *ifp, 
  		m = (*lagg_input_p)(ifp, m);
  		if (m != NULL)
  			ifp = m->m_pkthdr.rcvif;
 -		else 
 +		else {
 +			CURVNET_RESTORE();
  			return;
 +		}
  	}
  
  	/*
 @@ -681,6 +683,7 @@ ether_input_internal(struct ifnet *ifp, 
  #endif
  			ifp->if_ierrors++;
  			m_freem(m);
 +			CURVNET_RESTORE();
  			return;
  		}
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"