From owner-svn-src-releng@freebsd.org Thu Apr 27 06:52:32 2017 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6BF68D52936; Thu, 27 Apr 2017 06:52:32 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4916310BA; Thu, 27 Apr 2017 06:52:32 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3R6qV5r014575; Thu, 27 Apr 2017 06:52:31 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3R6qUJc014569; Thu, 27 Apr 2017 06:52:30 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201704270652.v3R6qUJc014569@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Thu, 27 Apr 2017 06:52:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r317487 - in releng: 10.3 10.3/sys/conf 10.3/sys/contrib/ipfilter/netinet 11.0 11.0/sys/conf 11.0/sys/contrib/ipfilter/netinet X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Apr 2017 06:52:32 -0000 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; }