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 | c566b99bac77a9a14c76bf2c175ea4985cb30ffe (patch) | |
| tree | 7ab86de8bd19d80b9b93bf17298a81ef1c7c8f8a | |
| parent | b8126de23e957978b4d0403097cd8402f0c1d82a (diff) | |
| download | FreeBSD-src-c566b99bac77a9a14c76bf2c175ea4985cb30ffe.zip FreeBSD-src-c566b99bac77a9a14c76bf2c175ea4985cb30ffe.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 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; } |
