From owner-svn-src-all@FreeBSD.ORG  Wed Aug 28 18:13:38 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 9D85F3CF;
 Wed, 28 Aug 2013 18:13:38 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8B1572C95;
 Wed, 28 Aug 2013 18:13:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7SIDc4h091636;
 Wed, 28 Aug 2013 18:13:38 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7SIDcpp091635;
 Wed, 28 Aug 2013 18:13:38 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201308281813.r7SIDcpp091635@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 28 Aug 2013 18:13:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r254998 - head/sys/dev/fb
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Aug 2013 18:13:38 -0000

Author: jkim
Date: Wed Aug 28 18:13:37 2013
New Revision: 254998
URL: http://svnweb.freebsd.org/changeset/base/254998

Log:
  Make sure to free stale buffer before allocating new one for safety.

Modified:
  head/sys/dev/fb/vesa.c

Modified: head/sys/dev/fb/vesa.c
==============================================================================
--- head/sys/dev/fb/vesa.c	Wed Aug 28 17:58:30 2013	(r254997)
+++ head/sys/dev/fb/vesa.c	Wed Aug 28 18:13:37 2013	(r254998)
@@ -1475,6 +1475,10 @@ vesa_save_state(video_adapter_t *adp, vo
 	if (vesa_state_buf_size > 0 && size < bsize)
 		return (EINVAL);
 
+	if (vesa_vmem_buf != NULL) {
+		free(vesa_vmem_buf, M_DEVBUF);
+		vesa_vmem_buf = NULL;
+	}
 	if (VESA_MODE(adp->va_mode) && adp->va_buffer != 0) {
 		buf = adp->va_buffer;
 		bsize = adp->va_buffer_size;
@@ -1486,8 +1490,7 @@ vesa_save_state(video_adapter_t *adp, vo
 		vesa_vmem_buf = malloc(bsize, M_DEVBUF, M_NOWAIT);
 		if (vesa_vmem_buf != NULL)
 			bcopy((void *)buf, vesa_vmem_buf, bsize);
-	} else
-		vesa_vmem_buf = NULL;
+	}
 	if (vesa_state_buf_size == 0)
 		return ((*prevvidsw->save_state)(adp, p, size));
 	((adp_state_t *)p)->sig = V_STATE_SIG;
@@ -1524,6 +1527,7 @@ vesa_load_state(video_adapter_t *adp, vo
 				bcopy(vesa_vmem_buf, (void *)buf, bsize);
 		}
 		free(vesa_vmem_buf, M_DEVBUF);
+		vesa_vmem_buf = NULL;
 	}
 	if (((adp_state_t *)p)->sig != V_STATE_SIG)
 		return ((*prevvidsw->load_state)(adp, p));