diff options
| author | delphij <delphij@FreeBSD.org> | 2017-04-27 06:52:30 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2017-04-27 06:52:30 +0000 |
| commit | 8c96ad701987adfb4a43df0b86c9cbdd7268a6d6 (patch) | |
| tree | 4e8e45a5e3655706df0d996d5233e188d01ef0a8 | |
| parent | 5fde0dfdaf2dfb5af2d9559dbfdc5aece1ae9be8 (diff) | |
| download | FreeBSD-src-8c96ad701987adfb4a43df0b86c9cbdd7268a6d6.zip FreeBSD-src-8c96ad701987adfb4a43df0b86c9cbdd7268a6d6.tar.gz | |
Fix ipfilter(4) fragment handling panic.
Security: FreeBSD-SA-17:04.ipfilter
Approved by: so
| -rw-r--r-- | UPDATING | 4 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 | ||||
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_frag.c | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to 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 diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index ac9624d..7314fb6 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="11.0" -BRANCH="RELEASE-p9" +BRANCH="RELEASE-p10" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi diff --git a/sys/contrib/ipfilter/netinet/ip_frag.c b/sys/contrib/ipfilter/netinet/ip_frag.c index 2826d67..a708257 100644 --- a/sys/contrib/ipfilter/netinet/ip_frag.c +++ b/sys/contrib/ipfilter/netinet/ip_frag.c @@ -474,7 +474,7 @@ ipfr_frag_new(softc, softf, fin, pass, table IPFR_CMPSZ)) { RWLOCK_EXIT(lock); FBUMPD(ifs_exists); - KFREE(fra); + KFREE(fran); return NULL; } |
