Author: delphij
Date: Thu Apr 27 06:52:30 2017
New Revision: 317487
URL: https://svnweb.freebsd.org/changeset/base/317487
Log:
Fix ipfilter(4) fragment handling panic.
Security: FreeBSD-SA-17:04.ipfilter
Approved by: so
Modified:
releng/10.3/UPDATING
releng/10.3/sys/conf/newvers.sh
releng/10.3/sys/contrib/ipfilter/netinet/ip_frag.c
releng/11.0/UPDATING
releng/11.0/sys/conf/newvers.sh
releng/11.0/sys/contrib/ipfilter/netinet/ip_frag.c
Modified: releng/10.3/UPDATING
==============================================================================
--- releng/10.3/UPDATING Thu Apr 27 06:29:02 2017 (r317486)
+++ releng/10.3/UPDATING Thu Apr 27 06:52:30 2017 (r317487)
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITH
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
Modified: releng/10.3/sys/conf/newvers.sh
==============================================================================
--- releng/10.3/sys/conf/newvers.sh Thu Apr 27 06:29:02 2017
(r317486)
+++ releng/10.3/sys/conf/newvers.sh Thu Apr 27 06:52:30 2017
(r317487)
@@ -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
Modified: releng/10.3/sys/contrib/ipfilter/netinet/ip_frag.c
==============================================================================
--- releng/10.3/sys/contrib/ipfilter/netinet/ip_frag.c Thu Apr 27 06:29:02
2017 (r317486)
+++ releng/10.3/sys/contrib/ipfilter/netinet/ip_frag.c Thu Apr 27 06:52:30
2017 (r317487)
@@ -456,7 +456,7 @@ ipfr_frag_new(softc, softf, fin, pass, t
IPFR_CMPSZ)) {
RWLOCK_EXIT(lock);
FBUMPD(ifs_exists);
- KFREE(fra);
+ KFREE(fran);
return NULL;
}
Modified: releng/11.0/UPDATING
==============================================================================
--- releng/11.0/UPDATING Thu Apr 27 06:29:02 2017 (r317486)
+++ releng/11.0/UPDATING Thu Apr 27 06:52:30 2017 (r317487)
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITH
the tip of head, and then rebuild without this option. The bootstrap process
from older version of current across the gcc/clang cutover is a bit fragile.
+20170427 p10 FreeBSD-SA-17:04.ipfilter
+
+ Fix ipfilter(4) fragment handling panic. [SA-17:04]
+
20170412 p9 FreeBSD-SA-17:03.ntp
FreeBSD-EN-17:05.xen
Modified: releng/11.0/sys/conf/newvers.sh
==============================================================================
--- releng/11.0/sys/conf/newvers.sh Thu Apr 27 06:29:02 2017
(r317486)
+++ releng/11.0/sys/conf/newvers.sh Thu Apr 27 06:52:30 2017
(r317487)
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="11.0"
-BRANCH="RELEASE-p9"
+BRANCH="RELEASE-p10"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
Modified: releng/11.0/sys/contrib/ipfilter/netinet/ip_frag.c
==============================================================================
--- releng/11.0/sys/contrib/ipfilter/netinet/ip_frag.c Thu Apr 27 06:29:02
2017 (r317486)
+++ releng/11.0/sys/contrib/ipfilter/netinet/ip_frag.c Thu Apr 27 06:52:30
2017 (r317487)
@@ -474,7 +474,7 @@ ipfr_frag_new(softc, softf, fin, pass, t
IPFR_CMPSZ)) {
RWLOCK_EXIT(lock);
FBUMPD(ifs_exists);
- KFREE(fra);
+ KFREE(fran);
return NULL;
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
