From owner-svn-src-stable-11@freebsd.org Fri May 25 06:25:34 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 82F22F73EA5; Fri, 25 May 2018 06:25:34 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 33CC874636; Fri, 25 May 2018 06:25:34 +0000 (UTC) (envelope-from cy@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 09FF71D2A4; Fri, 25 May 2018 06:25:34 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4P6PXRI090927; Fri, 25 May 2018 06:25:33 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4P6PXle090925; Fri, 25 May 2018 06:25:33 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201805250625.w4P6PXle090925@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Fri, 25 May 2018 06:25:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r334201 - stable/11/sys/contrib/ipfilter/netinet X-SVN-Group: stable-11 X-SVN-Commit-Author: cy X-SVN-Commit-Paths: stable/11/sys/contrib/ipfilter/netinet X-SVN-Commit-Revision: 334201 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 May 2018 06:25:34 -0000 Author: cy Date: Fri May 25 06:25:33 2018 New Revision: 334201 URL: https://svnweb.freebsd.org/changeset/base/334201 Log: MFC r333392-r333393, r333427 r333392: Fix memory leak. (CID 1199373). r333393: Document intentional fallthrough. (CID 976535) r333427: Fix style error introduced in r333393. Reported by: jhb, imp, phk Approved by: re (delphij) Modified: stable/11/sys/contrib/ipfilter/netinet/fil.c stable/11/sys/contrib/ipfilter/netinet/ip_dstlist.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/contrib/ipfilter/netinet/fil.c ============================================================================== --- stable/11/sys/contrib/ipfilter/netinet/fil.c Fri May 25 03:34:33 2018 (r334200) +++ stable/11/sys/contrib/ipfilter/netinet/fil.c Fri May 25 06:25:33 2018 (r334201) @@ -1299,6 +1299,7 @@ ipf_pr_icmp(fin) } } #endif + /* FALLTHROUGH */ case ICMP_SOURCEQUENCH : case ICMP_REDIRECT : case ICMP_TIMXCEED : Modified: stable/11/sys/contrib/ipfilter/netinet/ip_dstlist.c ============================================================================== --- stable/11/sys/contrib/ipfilter/netinet/ip_dstlist.c Fri May 25 03:34:33 2018 (r334200) +++ stable/11/sys/contrib/ipfilter/netinet/ip_dstlist.c Fri May 25 06:25:33 2018 (r334201) @@ -690,6 +690,7 @@ ipf_dstlist_node_del(softc, arg, op, uid) err = COPYIN(op->iplo_struct, temp, size); if (err != 0) { IPFERROR(120027); + KFREES(temp, size); return EFAULT; }