From owner-svn-src-head@freebsd.org  Sun Apr 16 01:15:39 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 17C8ED35ABB;
 Sun, 16 Apr 2017 01:15:39 +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 mx1.freebsd.org (Postfix) with ESMTPS id DC2AA1D94;
 Sun, 16 Apr 2017 01:15:38 +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 v3G1FcpE028511;
 Sun, 16 Apr 2017 01:15:38 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3G1FcL3028510;
 Sun, 16 Apr 2017 01:15:38 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201704160115.v3G1FcL3028510@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Sun, 16 Apr 2017 01:15:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r316994 - head/contrib/ipfilter/tools
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Apr 2017 01:15:39 -0000

Author: cy
Date: Sun Apr 16 01:15:37 2017
New Revision: 316994
URL: https://svnweb.freebsd.org/changeset/base/316994

Log:
  Fix CID 1372600, possible NULL pointer dereference should
  reallocarray() fail.
  
  Reported by:	Coverity CID 1372600
  MFC after:	1 week

Modified:
  head/contrib/ipfilter/tools/ipf_y.y

Modified: head/contrib/ipfilter/tools/ipf_y.y
==============================================================================
--- head/contrib/ipfilter/tools/ipf_y.y	Sun Apr 16 01:13:47 2017	(r316993)
+++ head/contrib/ipfilter/tools/ipf_y.y	Sun Apr 16 01:15:37 2017	(r316994)
@@ -2195,6 +2195,10 @@ char *phrase;
 			for (i = 0, s = strtok(phrase, " \r\n\t"); s != NULL;
 			     s = strtok(NULL, " \r\n\t"), i++) {
 				fb = reallocarray(fb, i / 4 + 1, sizeof(*fb));
+				if (fb == NULL) {
+					perror("memory allocation error at __LINE__ in __FUNCTION__ in __FILE");
+					abort();
+				}
 				l = (u_32_t)strtol(s, NULL, 0);
 				switch (i & 3)
 				{