From owner-svn-src-all@FreeBSD.ORG  Tue Nov 27 06:35:26 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E779CDE3;
 Tue, 27 Nov 2012 06:35:26 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C35EC8FC14;
 Tue, 27 Nov 2012 06:35:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAR6ZQLA099492;
 Tue, 27 Nov 2012 06:35:26 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAR6ZQPE099491;
 Tue, 27 Nov 2012 06:35:26 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201211270635.qAR6ZQPE099491@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 27 Nov 2012 06:35:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243601 - head/sys/net
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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, 27 Nov 2012 06:35:27 -0000

Author: glebius
Date: Tue Nov 27 06:35:26 2012
New Revision: 243601
URL: http://svnweb.freebsd.org/changeset/base/243601

Log:
    Better safe than sorry: reinitialize eh after ng_ether(4) and
  if_bridge(4) processing, since mbuf may be modified there.
  
  Submitted by:	youngari

Modified:
  head/sys/net/if_ethersubr.c

Modified: head/sys/net/if_ethersubr.c
==============================================================================
--- head/sys/net/if_ethersubr.c	Tue Nov 27 06:20:40 2012	(r243600)
+++ head/sys/net/if_ethersubr.c	Tue Nov 27 06:35:26 2012	(r243601)
@@ -593,6 +593,7 @@ ether_input_internal(struct ifnet *ifp, 
 			CURVNET_RESTORE();
 			return;
 		}
+		eh = mtod(m, struct ether_header *);
 	}
 
 	/*
@@ -607,6 +608,7 @@ ether_input_internal(struct ifnet *ifp, 
 			CURVNET_RESTORE();
 			return;
 		}
+		eh = mtod(m, struct ether_header *);
 	}
 
 #if defined(INET) || defined(INET6)