summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2017-04-27 10:47:32 -0300
committerRenato Botelho <renato@netgate.com>2017-04-27 10:47:32 -0300
commitbbfdb9a1d32f8fbc853e0422c9916f660f048893 (patch)
treedfd1421b8b595f47b058342371efedabcfc03347
parent07324460536d4fea98778edbb99e88f512dd3a6c (diff)
parentc566b99bac77a9a14c76bf2c175ea4985cb30ffe (diff)
downloadFreeBSD-src-bbfdb9a1d32f8fbc853e0422c9916f660f048893.zip
FreeBSD-src-bbfdb9a1d32f8fbc853e0422c9916f660f048893.tar.gz
Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3
-rw-r--r--UPDATING4
-rw-r--r--sys/conf/newvers.sh2
-rw-r--r--sys/contrib/ipfilter/netinet/ip_frag.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/UPDATING b/UPDATING
index 0688d5a..a1bef13 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG to bootstrap to the tip of
stable/10, and then rebuild without this option. The bootstrap process from
older version of current is a bit fragile.
+20170427 p19 FreeBSD-SA-17:04.ipfilter
+
+ Fix ipfilter(4) fragment handling panic. [SA-17:04]
+
20170412 p18 FreeBSD-SA-17:03.ntp
FreeBSD-EN-17:05.xen
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;
}
OpenPOWER on IntegriCloud