From owner-svn-src-all@freebsd.org  Wed Jul 29 20:10:37 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B68A09ADC1C;
 Wed, 29 Jul 2015 20:10:37 +0000 (UTC) (envelope-from eri@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A208F1C04;
 Wed, 29 Jul 2015 20:10:37 +0000 (UTC) (envelope-from eri@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6TKAbcj017214;
 Wed, 29 Jul 2015 20:10:37 GMT (envelope-from eri@FreeBSD.org)
Received: (from eri@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6TKAbjL017213;
 Wed, 29 Jul 2015 20:10:37 GMT (envelope-from eri@FreeBSD.org)
Message-Id: <201507292010.t6TKAbjL017213@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: eri set sender to eri@FreeBSD.org
 using -f
From: Ermal Luçi <eri@FreeBSD.org>
Date: Wed, 29 Jul 2015 20:10:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r286037 - head/sys/netinet
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.20
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: Wed, 29 Jul 2015 20:10:37 -0000

Author: eri
Date: Wed Jul 29 20:10:36 2015
New Revision: 286037
URL: https://svnweb.freebsd.org/changeset/base/286037

Log:
  Avoid double reference decrement when firewalls force relooping of packets
  
  When firewalls force a reloop of packets and the caller supplied a route the reference to the route might be reduced twice creating issues.
  This is especially the scenario when a packet is looped because of operation in the firewall but the new route lookup gives a down route.
  
  Differential Revision:	https://reviews.freebsd.org/D3037
  Reviewed by:	gnn
  Approved by:	gnn(mentor)

Modified:
  head/sys/netinet/ip_output.c

Modified: head/sys/netinet/ip_output.c
==============================================================================
--- head/sys/netinet/ip_output.c	Wed Jul 29 20:02:20 2015	(r286036)
+++ head/sys/netinet/ip_output.c	Wed Jul 29 20:10:36 2015	(r286037)
@@ -681,6 +681,13 @@ sendit:
 done:
 	if (ro == &iproute)
 		RO_RTFREE(ro);
+	else if (rte == NULL)
+		/*
+		 * If the caller supplied a route but somehow the reference
+		 * to it has been released need to prevent the caller
+		 * calling RTFREE on it again.
+		 */
+		ro->ro_rt = NULL;
 	if (have_ia_ref)
 		ifa_free(&ia->ia_ifa);
 	return (error);