From owner-svn-src-head@freebsd.org  Wed May 24 14:24:49 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 5AFBED7B3DC;
 Wed, 24 May 2017 14:24:49 +0000 (UTC) (envelope-from pfg@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 2B1571F11;
 Wed, 24 May 2017 14:24:49 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4OEOmMC053465;
 Wed, 24 May 2017 14:24:48 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4OEOmIf053464;
 Wed, 24 May 2017 14:24:48 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201705241424.v4OEOmIf053464@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Wed, 24 May 2017 14:24:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r318788 - head/usr.sbin/bhyve
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: Wed, 24 May 2017 14:24:49 -0000

Author: pfg
Date: Wed May 24 14:24:47 2017
New Revision: 318788
URL: https://svnweb.freebsd.org/changeset/base/318788

Log:
  bhyvegc_resize: make use of reallocarray(3) for bounds-checking.
  
  Also add __FBSDID.
  
  Reviewed by:	grehan
  
  This file lacks a license(!) so for this change the following declaration
  applies:
  
  To the greatest extent permitted by, but not in contravention of,
  applicable law, Affirmer hereby overtly, fully, permanently, irrevocably
  and unconditionally waives, abandons, and surrenders all of Affirmer's
  Copyright and Related Rights and associated claims and causes of action,
  whether now known or unknown (including existing as well as future claims
  and causes of action).

Modified:
  head/usr.sbin/bhyve/bhyvegc.c

Modified: head/usr.sbin/bhyve/bhyvegc.c
==============================================================================
--- head/usr.sbin/bhyve/bhyvegc.c	Wed May 24 14:22:22 2017	(r318787)
+++ head/usr.sbin/bhyve/bhyvegc.c	Wed May 24 14:24:47 2017	(r318788)
@@ -1,4 +1,5 @@
 #include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 
@@ -56,9 +57,11 @@ bhyvegc_resize(struct bhyvegc *gc, int w
 	gc_image->width = width;
 	gc_image->height = height;
 	if (!gc->raw) {
-		gc_image->data = realloc(gc_image->data,
-		    sizeof (uint32_t) * width * height);
-		memset(gc_image->data, 0, width * height * sizeof (uint32_t));
+		gc_image->data = reallocarray(gc_image->data, width * height,
+		    sizeof (uint32_t));
+		if (gc_image->data != NULL)
+			memset(gc_image->data, 0, width * height *
+			    sizeof (uint32_t));
 	}
 }