From c566b99bac77a9a14c76bf2c175ea4985cb30ffe Mon Sep 17 00:00:00 2001
From: delphij <delphij@FreeBSD.org>
Date: Thu, 27 Apr 2017 06:52:30 +0000
Subject: Fix ipfilter(4) fragment handling panic.

Security:	FreeBSD-SA-17:04.ipfilter
Approved by:	so
---
 sys/conf/newvers.sh                    | 2 +-
 sys/contrib/ipfilter/netinet/ip_frag.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'sys')

diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index a67acf9..88c6932 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="10.3"
-BRANCH="RELEASE-p18"
+BRANCH="RELEASE-p19"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
diff --git a/sys/contrib/ipfilter/netinet/ip_frag.c b/sys/contrib/ipfilter/netinet/ip_frag.c
index 7e3457a..10dee09 100644
--- a/sys/contrib/ipfilter/netinet/ip_frag.c
+++ b/sys/contrib/ipfilter/netinet/ip_frag.c
@@ -456,7 +456,7 @@ ipfr_frag_new(softc, softf, fin, pass, table
 			  IPFR_CMPSZ)) {
 			RWLOCK_EXIT(lock);
 			FBUMPD(ifs_exists);
-			KFREE(fra);
+			KFREE(fran);
 			return NULL;
 		}
 
-- 
cgit v1.1